diff --git a/reactos/include/ndk/arch/ketypes.h b/reactos/include/ndk/arch/ketypes.h
index 76e3b3db1e9..d60a4d4f18e 100644
--- a/reactos/include/ndk/arch/ketypes.h
+++ b/reactos/include/ndk/arch/ketypes.h
@@ -19,23 +19,6 @@ Author:
 #ifndef _ARCH_KETYPES_H
 #define _ARCH_KETYPES_H
 
-//
-// FIXME: Find a solution to take these out of here!
-//
-typedef struct _KDPC_DATA
-{
-    LIST_ENTRY DpcListHead;
-    ULONG DpcLock;
-    ULONG DpcQueueDepth;
-    ULONG DpcCount;
-} KDPC_DATA, *PKDPC_DATA;
-
-typedef struct _PP_LOOKASIDE_LIST
-{
-    struct _GENERAL_LOOKASIDE *P;
-    struct _GENERAL_LOOKASIDE *L;
-} PP_LOOKASIDE_LIST, *PPP_LOOKASIDE_LIST;
-
 //
 // Include the right file for this architecture.
 //
diff --git a/reactos/include/ndk/extypes.h b/reactos/include/ndk/extypes.h
index 4bfc945bee6..07af4cc4b24 100644
--- a/reactos/include/ndk/extypes.h
+++ b/reactos/include/ndk/extypes.h
@@ -47,6 +47,11 @@ extern POBJECT_TYPE NTSYSAPI ExIoCompletionType;
 extern POBJECT_TYPE NTSYSAPI ExMutantObjectType;
 extern POBJECT_TYPE NTSYSAPI ExTimerType;
 
+//
+// Exported NT Build Number
+//
+extern ULONG NTSYSAPI NtBuildNumber;
+
 //
 // Invalid Handle Value Constant
 //
@@ -79,11 +84,6 @@ extern POBJECT_TYPE NTSYSAPI ExTimerType;
 #define SEMAPHORE_QUERY_STATE           0x0001
 #endif
 
-//
-// Port Object Access Masks (FIXME: lpctypes.h?)
-//
-#define PORT_ALL_ACCESS                 0x1
-
 //
 // Event Pair Access Masks
 //
diff --git a/reactos/include/ndk/fixmes.txt b/reactos/include/ndk/fixmes.txt
index 0b85e8977b2..c84eeb2a618 100644
--- a/reactos/include/ndk/fixmes.txt
+++ b/reactos/include/ndk/fixmes.txt
@@ -23,14 +23,6 @@ ________________________________________________________________________________
 |extypes.h	- Class 42 (SYSTEM_POWER_INFORMATION causes conflict).
 |extypes.h	- Classes 13, 20, 30, 31, 49, 51, 52, 54+ are undefined.
 |ntndk.h	- Incorrect rounding macro names
-|
-[MINOR]		- Related to location of functions, comments, etc.
-|arch/ketypes.h	- _KDPC_DATA, PP_LOOKASIDE_LIST shouldn't be there.
-|pstypes.h	- Check if _PAGEFAULT_HISTORY shouldn't go in mmtypes.h instead.
-|lpctypes.h	- Consider moving _CLIENT_DIED_MSG to pstypes.h?
-|ketypes.h	- Consider moving KNODE to mmtypes.h?
-|ketypes.h	- Consider moving NtBuildNumber to extypes.h?
-|extypes.h	- consider moving PORT_ALL_ACCESS to lpctypes.h
 |_____________________________________________________________________________________
 
 
diff --git a/reactos/include/ndk/ketypes.h b/reactos/include/ndk/ketypes.h
index ccf7dfe5fae..aad9d30f346 100644
--- a/reactos/include/ndk/ketypes.h
+++ b/reactos/include/ndk/ketypes.h
@@ -28,7 +28,6 @@ Author:
 #include <haltypes.h>
 #include <potypes.h>
 #include <ifssupp.h>
-#include <arch/ketypes.h>
 #endif
 
 //
@@ -304,6 +303,41 @@ typedef struct _KUSER_SHARED_DATA
 
 #else
 
+//
+// APC Environment Types
+//
+typedef enum _KAPC_ENVIRONMENT
+{
+    OriginalApcEnvironment,
+    AttachedApcEnvironment,
+    CurrentApcEnvironment
+} KAPC_ENVIRONMENT;
+
+//
+// PRCB DPC Data
+//
+typedef struct _KDPC_DATA
+{
+    LIST_ENTRY DpcListHead;
+    ULONG DpcLock;
+    ULONG DpcQueueDepth;
+    ULONG DpcCount;
+} KDPC_DATA, *PKDPC_DATA;
+
+//
+// Per-Processor Lookaside List
+//
+typedef struct _PP_LOOKASIDE_LIST
+{
+    struct _GENERAL_LOOKASIDE *P;
+    struct _GENERAL_LOOKASIDE *L;
+} PP_LOOKASIDE_LIST, *PPP_LOOKASIDE_LIST;
+
+//
+// Architectural Types
+//
+#include <arch/ketypes.h>
+
 //
 // ARC Component Data
 //
@@ -315,16 +349,6 @@ typedef struct _CONFIGURATION_COMPONENT_DATA
     CONFIGURATION_COMPONENT Component;
 } CONFIGURATION_COMPONENT_DATA, *PCONFIGURATION_COMPONENT_DATA;
 
-//
-// APC Environment Types
-//
-typedef enum _KAPC_ENVIRONMENT
-{
-    OriginalApcEnvironment,
-    AttachedApcEnvironment,
-    CurrentApcEnvironment
-} KAPC_ENVIRONMENT;
-
 //
 // Kernel Memory Node (FIXME: mmtypes?
 //
@@ -703,11 +727,6 @@ extern ULONG NTSYSAPI KeMinimumIncrement;
 extern ULONG NTSYSAPI KeDcacheFlushCount;
 extern ULONG NTSYSAPI KeIcacheFlushCount;
 
-//
-// Exported NT Build Number (FIXME: move?)
-//
-extern ULONG NTSYSAPI NtBuildNumber;
-
 //
 // Exported System Service Descriptor Tables
 //
diff --git a/reactos/include/ndk/lpctypes.h b/reactos/include/ndk/lpctypes.h
index 182115e677d..59361725e96 100644
--- a/reactos/include/ndk/lpctypes.h
+++ b/reactos/include/ndk/lpctypes.h
@@ -30,6 +30,11 @@ Author:
 //
 #define PORT_MAXIMUM_MESSAGE_LENGTH     256
 
+//
+// Port Object Access Masks
+//
+#define PORT_ALL_ACCESS                 0x1
+
 //
 // LPC Message Types
 //