diff --git a/reactos/dll/win32/newdev/newdev.c b/reactos/dll/win32/newdev/newdev.c
index d7f375142fa..72f5bccaac8 100644
--- a/reactos/dll/win32/newdev/newdev.c
+++ b/reactos/dll/win32/newdev/newdev.c
@@ -22,6 +22,9 @@
 
 #include "newdev_private.h"
 
+#include <stdio.h>
+#include <winnls.h>
+
 /* Global variables */
 HINSTANCE hDllInstance;
 
diff --git a/reactos/dll/win32/newdev/newdev_private.h b/reactos/dll/win32/newdev/newdev_private.h
index e622c38132d..1161203b3f1 100644
--- a/reactos/dll/win32/newdev/newdev_private.h
+++ b/reactos/dll/win32/newdev/newdev_private.h
@@ -1,31 +1,26 @@
 #ifndef __NEWDEV_PRIVATE_H
 #define __NEWDEV_PRIVATE_H
 
+#include <stdarg.h>
+
 #define WIN32_NO_STATUS
 #define _INC_WINDOWS
 #define COM_NO_WINDOWS_H
 
 #define COBJMACROS
 
-#include <stdarg.h>
 #include <windef.h>
 #include <winbase.h>
 #include <winreg.h>
 #include <wingdi.h>
 #include <winuser.h>
-#include <winnls.h>
 #include <windowsx.h>
-#include <wincon.h>
 #include <newdev.h>
 #include <regstr.h>
-#include <cfgmgr32.h>
-#include <shlobj.h>
 
 #include <wine/debug.h>
 WINE_DEFAULT_DEBUG_CHANNEL(newdev);
 
-#include <stdio.h>
-
 #include "resource.h"
 
 extern HINSTANCE hDllInstance;
diff --git a/reactos/dll/win32/newdev/wizard.c b/reactos/dll/win32/newdev/wizard.c
index 3e834c7955a..12be7e0dedc 100644
--- a/reactos/dll/win32/newdev/wizard.c
+++ b/reactos/dll/win32/newdev/wizard.c
@@ -20,6 +20,10 @@
 
 #include "newdev_private.h"
 
+#include <wincon.h>
+#include <cfgmgr32.h>
+#include <shlobj.h>
+
 HANDLE hThread;
 
 static VOID