diff --git a/reactos/include/ndk/mmtypes.h b/reactos/include/ndk/mmtypes.h
index add7d11441e..fc9d091ec42 100644
--- a/reactos/include/ndk/mmtypes.h
+++ b/reactos/include/ndk/mmtypes.h
@@ -31,6 +31,7 @@ typedef enum _PP_NPAGED_LOOKASIDE_NUMBER
 /* TYPES *********************************************************************/
 
 /* FIXME: Forced to do this for now, because of EPROCESS, will go away before 0.3.0 */
+#ifndef __NTOSKRNL__
 typedef struct _MADDRESS_SPACE
 {
     PVOID MemoryAreaRoot;
@@ -40,6 +41,7 @@ typedef struct _MADDRESS_SPACE
     PUSHORT PageTableRefCountTable;
     ULONG PageTableRefCountTableSize;
 } MADDRESS_SPACE, *PMADDRESS_SPACE;
+#endif
 
 typedef struct _PP_LOOKASIDE_LIST 
 {
diff --git a/reactos/include/ndk/pstypes.h b/reactos/include/ndk/pstypes.h
index 28e5f3c77b4..f5b0e850dff 100644
--- a/reactos/include/ndk/pstypes.h
+++ b/reactos/include/ndk/pstypes.h
@@ -262,6 +262,11 @@ typedef struct _TEB
 #include "extypes.h"
 #include "setypes.h"
 
+/* FIXME: see note in mmtypes.h */
+#ifdef _NTOSKRNL_
+#include <internal/mm.h>
+#endif
+
 typedef struct _EPROCESS_QUOTA_ENTRY
 {
     ULONG Usage;