Porting fixes.

dlls/setupapi/devinst.c

@@ -22,11 +22,13 @@
 
 #include "windef.h"
 #include "winbase.h"
-#include "wine/debug.h"
 #include "wingdi.h"
 #include "winuser.h"
 #include "winnls.h"
+#include "winreg.h"
 #include "setupapi.h"
+#include "wine/debug.h"
+
 
 WINE_DEFAULT_DEBUG_CHANNEL(setupapi);
 

dlls/setupapi/infparse.c

@@ -27,16 +27,15 @@
 
 #include <stdarg.h>
 #include <string.h>
+
 #include "windef.h"
 #include "winbase.h"
 #include "winreg.h"
 #include "winternl.h"
-#include "wine/winbase16.h"
 #include "wingdi.h"
 #include "winuser.h"
 #include "winnls.h"
 #include "setupapi.h"
-#include "setupx16.h"
 #include "setupapi_private.h"
 #include "wine/debug.h"
 

dlls/setupapi/install.c

@@ -29,8 +29,8 @@
 #include "winuser.h"
 #include "winnls.h"
 #include "setupapi.h"
-#include "wine/unicode.h"
 #include "setupapi_private.h"
+#include "wine/unicode.h"
 #include "wine/debug.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(setupapi);

dlls/setupapi/parser.c

@@ -29,15 +29,15 @@
 
 #include "windef.h"
 #include "winbase.h"
-#include "winreg.h"
-#include "winternl.h"
-#include "winerror.h"
-#include "wine/unicode.h"
 #include "wingdi.h"
 #include "winuser.h"
 #include "winnls.h"
+#include "winreg.h"
+#include "winternl.h"
+#include "winerror.h"
 #include "setupapi.h"
-#include "setupx16.h"
+
+#include "wine/unicode.h"
 #include "wine/debug.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(setupapi);

dlls/setupapi/queue.c

@@ -31,7 +31,7 @@
 #include "setupapi.h"
 #include "wine/unicode.h"
 #include "setupapi_private.h"
-#include "ver.h"
+#include "winver.h"
 #include "wine/debug.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(setupapi);

dlls/setupapi/setupcab.c

@@ -26,11 +26,14 @@
 #include <stdarg.h>
 #include "string.h"
 #include "stdlib.h"
+
+#include "wine/debug.h"
 #include "windef.h"
 #include "winbase.h"
 #include "wingdi.h"
 #include "winuser.h"
 #include "winnls.h"
+#include "winreg.h"
 #include "setupapi.h"
 #include "setupapi_private.h"
 #include "fdi.h"

dlls/setupapi/stubs.c

@@ -26,6 +26,7 @@
 #include "wingdi.h"
 #include "winuser.h"
 #include "winnls.h"
+#include "winreg.h"
 #include "setupapi.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(setupapi);