diff --git a/reactos/dll/win32/msgina/gui.c b/reactos/dll/win32/msgina/gui.c
index 33abbd7d801..c6c4524009a 100644
--- a/reactos/dll/win32/msgina/gui.c
+++ b/reactos/dll/win32/msgina/gui.c
@@ -7,6 +7,9 @@
 
 #include "msgina.h"
 
+#include <wingdi.h>
+#include <winnls.h>
+
 typedef struct _DISPLAYSTATUSMSG
 {
     PGINA_CONTEXT Context;
diff --git a/reactos/dll/win32/msgina/msgina.c b/reactos/dll/win32/msgina/msgina.c
index 167fb45c152..04482f309cd 100644
--- a/reactos/dll/win32/msgina/msgina.c
+++ b/reactos/dll/win32/msgina/msgina.c
@@ -26,6 +26,11 @@
 
 #include "msgina.h"
 
+#include <winreg.h>
+#include <winsvc.h>
+#include <userenv.h>
+#include <ndk/sefuncs.h>
+
 HINSTANCE hDllInstance;
 
 extern GINA_UI GinaGraphicalUI;
diff --git a/reactos/dll/win32/msgina/msgina.h b/reactos/dll/win32/msgina/msgina.h
index f36450d47f7..7709e75eb50 100644
--- a/reactos/dll/win32/msgina/msgina.h
+++ b/reactos/dll/win32/msgina/msgina.h
@@ -1,24 +1,17 @@
 #ifndef _MSGINA_H
 #define _MSGINA_H
 
-#define WIN32_NO_STATUS
-
 #include <stdarg.h>
-#include <stdlib.h>
+
+#define WIN32_NO_STATUS
+#define _INC_WINDOWS
+#define COM_NO_WINDOWS_H
+
 #include <windef.h>
 #include <winbase.h>
-#include <wincon.h>
-#include <winreg.h>
-#include <wingdi.h>
-#include <winnls.h>
-#include <winsvc.h>
 #include <winuser.h>
-#include <userenv.h>
 #include <winwlx.h>
-#include <ndk/obfuncs.h>
 #include <ndk/rtlfuncs.h>
-#include <ndk/sefuncs.h>
-#include <ntlsa.h>
 #include <ntsecapi.h>
 
 #include <wine/debug.h>
@@ -116,5 +109,3 @@ DoLoginTasks(
     IN PWSTR Password);
 
 #endif /* _MSGINA_H */
-
-/* EOF */
diff --git a/reactos/dll/win32/msgina/tui.c b/reactos/dll/win32/msgina/tui.c
index 3a99ea4e373..fb40c421a2d 100644
--- a/reactos/dll/win32/msgina/tui.c
+++ b/reactos/dll/win32/msgina/tui.c
@@ -7,6 +7,8 @@
 
 #include "msgina.h"
 
+#include <wincon.h>
+
 static BOOL
 TUIInitialize(
     IN OUT PGINA_CONTEXT pgContext)