diff --git a/reactos/include/ndk/extypes.h b/reactos/include/ndk/extypes.h
index 30437447db8..302a44d5855 100644
--- a/reactos/include/ndk/extypes.h
+++ b/reactos/include/ndk/extypes.h
@@ -63,7 +63,7 @@ extern POBJECT_TYPE NTSYSAPI ExTimerType;
 //
 // Exported NT Build Number
 //
-extern ULONG NTSYSAPI NtBuildNumber;
+extern ULONG NtBuildNumber;
 
 //
 // Invalid Handle Value Constant
diff --git a/reactos/lib/cmlib/cmdata.h b/reactos/lib/cmlib/cmdata.h
index 04b949f2304..d0266ee01e5 100644
--- a/reactos/lib/cmlib/cmdata.h
+++ b/reactos/lib/cmlib/cmdata.h
@@ -18,6 +18,8 @@
 #define  REG_VALUE_CELL_ID             0x6b76
 #define  REG_SECURITY_CELL_ID          0x6b73
 
+#ifndef _CM_
+
 #include <pshpack1.h>
 
 typedef struct _CM_VIEW_OF_FILE
@@ -147,4 +149,6 @@ typedef struct _CM_KEY_SECURITY
 
 #include <poppack.h>
 
+#endif
+
 #endif /* CMLIB_CMDATA_H */
diff --git a/reactos/lib/cmlib/cmlib.h b/reactos/lib/cmlib/cmlib.h
index ab699d63906..91a2229a198 100644
--- a/reactos/lib/cmlib/cmlib.h
+++ b/reactos/lib/cmlib/cmlib.h
@@ -64,7 +64,7 @@ typedef struct _HMAP_ENTRY
 {
     ULONG_PTR Bin;
     ULONG_PTR Block;
-    PCM_VIEW_OF_FILE CmHive;
+    struct _CM_VIEW_OF_FILE *CmHive;
     ULONG MemAlloc;
 } HMAP_ENTRY, *PHMAP_ENTRY;
 
@@ -118,6 +118,7 @@ typedef struct _HHIVE
     DUAL Storage[HvMaxStorageType];
 } HHIVE, *PHHIVE;
 
+#ifndef _CM_
 typedef struct _EREGISTRY_HIVE
 {
   HHIVE Hive;
@@ -129,6 +130,7 @@ typedef struct _EREGISTRY_HIVE
   HANDLE  HiveHandle;
   HANDLE  LogHandle;
 } EREGISTRY_HIVE, *PEREGISTRY_HIVE;
+#endif
 
 /*
  * Public functions.