diff --git a/reactos/base/applications/charmap/charmap.c b/reactos/base/applications/charmap/charmap.c
index 33d73517124..eefa9193d2e 100644
--- a/reactos/base/applications/charmap/charmap.c
+++ b/reactos/base/applications/charmap/charmap.c
@@ -13,9 +13,11 @@
 
 HINSTANCE hInstance;
 HWND      hAdvancedDlg;
+HWND      hCharmapDlg;
 HWND      hStatusWnd;
 HICON     hSmIcon;
 HICON     hBgIcon;
+SETTINGS  Settings;
 
 /* Font-enumeration callback */
 static
diff --git a/reactos/base/applications/charmap/precomp.h b/reactos/base/applications/charmap/precomp.h
index e59ad0dac30..c2779ccec54 100644
--- a/reactos/base/applications/charmap/precomp.h
+++ b/reactos/base/applications/charmap/precomp.h
@@ -57,8 +57,8 @@ typedef struct {
     BOOL IsAdvancedView;
 } SETTINGS;
 
-SETTINGS Settings;
-HWND hCharmapDlg;
+extern SETTINGS Settings;
+extern HWND hCharmapDlg;
 
 LRESULT CALLBACK LrgCellWndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam);
 
diff --git a/reactos/drivers/filters/mountmgr/mntmgr.h b/reactos/drivers/filters/mountmgr/mntmgr.h
index 06c61192be2..f1c401a396e 100644
--- a/reactos/drivers/filters/mountmgr/mntmgr.h
+++ b/reactos/drivers/filters/mountmgr/mntmgr.h
@@ -152,8 +152,6 @@ typedef struct _UNIQUE_ID_WORK_ITEM
     ULONG StackSize;                          // 0x2C
 } UNIQUE_ID_WORK_ITEM, *PUNIQUE_ID_WORK_ITEM; // 0x30
 
-PDEVICE_OBJECT gdeviceObject;
-
 /* Memory allocation helpers */
 #define AllocatePool(Size) ExAllocatePoolWithTag(PagedPool, Size, 'AtnM')
 #define FreePool(P)        ExFreePoolWithTag(P, 'AtnM')
@@ -168,6 +166,7 @@ PDEVICE_OBJECT gdeviceObject;
 /* mountmgr.c */
 
 extern UNICODE_STRING DosDevicesMount;
+extern PDEVICE_OBJECT gdeviceObject;
 extern UNICODE_STRING ReparseIndex;
 extern UNICODE_STRING DeviceFloppy;
 extern UNICODE_STRING DeviceMount;
diff --git a/reactos/drivers/filters/mountmgr/mountmgr.c b/reactos/drivers/filters/mountmgr/mountmgr.c
index 06f5ab37543..260852eb031 100644
--- a/reactos/drivers/filters/mountmgr/mountmgr.c
+++ b/reactos/drivers/filters/mountmgr/mountmgr.c
@@ -34,6 +34,7 @@
 /* FIXME */
 GUID MountedDevicesGuid = {0x53F5630D, 0xB6BF, 0x11D0, {0x94, 0xF2, 0x00, 0xA0, 0xC9, 0x1E, 0xFB, 0x8B}};
 
+PDEVICE_OBJECT gdeviceObject;
 KEVENT UnloadEvent;
 LONG Unloading;
 
diff --git a/reactos/ntoskrnl/cache/section/data.c b/reactos/ntoskrnl/cache/section/data.c
index 07ffb7d64c3..5b1f40ea43d 100644
--- a/reactos/ntoskrnl/cache/section/data.c
+++ b/reactos/ntoskrnl/cache/section/data.c
@@ -91,8 +91,6 @@ extern PMMWSL MmWorkingSetList;
 
 /* GLOBALS *******************************************************************/
 
-ULONG_PTR MmSubsectionBase;
-
 static const INFORMATION_CLASS_INFO ExSectionInfoClass[] =
 {
     ICI_SQ_SAME( sizeof(SECTION_BASIC_INFORMATION), sizeof(ULONG), ICIF_QUERY ), /* SectionBasicInformation */
diff --git a/reactos/subsystems/win32/csrss/csrsrv/api/wapi.c b/reactos/subsystems/win32/csrss/csrsrv/api/wapi.c
index 3138178d69a..adf9c582dcd 100644
--- a/reactos/subsystems/win32/csrss/csrsrv/api/wapi.c
+++ b/reactos/subsystems/win32/csrss/csrsrv/api/wapi.c
@@ -22,7 +22,7 @@ static PCSRSS_API_DEFINITION ApiDefinitions = NULL;
 UNICODE_STRING CsrApiPortName;
 volatile LONG CsrpStaticThreadCount;
 volatile LONG CsrpDynamicThreadTotal;
-ULONG CsrMaxApiRequestThreads;
+extern ULONG CsrMaxApiRequestThreads;
 
 /* FUNCTIONS *****************************************************************/