[USETUP]

* Remove one time inclusions from the main header and put them back where they belong.
* Improve the GUIDs situation.
* Improve the main header.
CORE-7716

svn path=/trunk/; revision=61609

reactos/base/setup/usetup/cabinet.c

@@ -10,6 +10,8 @@
 
 #include "usetup.h"
 
+#include <zlib.h>
+
 #define NDEBUG
 #include <debug.h>
 

reactos/base/setup/usetup/interface/devinst.c

@@ -11,6 +11,10 @@
 #define NDEBUG
 #include <debug.h>
 
+#define INITGUID
+#include <guiddef.h>
+#include <libs/umpnpmgr/sysguid.h>
+
 BOOLEAN
 ResetDevice(
     IN LPCWSTR DeviceId)

reactos/base/setup/usetup/interface/usetup.c

@@ -28,6 +28,12 @@
 
 #include <usetup.h>
 
+#include "bootsup.h"
+#include "chkdsk.h"
+#include "format.h"
+#include "drivesup.h"
+#include "settings.h"
+
 #define NDEBUG
 #include <debug.h>
 

reactos/base/setup/usetup/partlist.c

@@ -26,6 +26,8 @@
 
 #include "usetup.h"
 
+#include <ntddscsi.h>
+
 #define NDEBUG
 #include <debug.h>
 

reactos/base/setup/usetup/usetup.h

@@ -41,7 +41,6 @@
 #include <ndk/exfuncs.h>
 #include <ndk/iofuncs.h>
 #include <ndk/kefuncs.h>
-#include <ndk/mmtypes.h>
 #include <ndk/mmfuncs.h>
 #include <ndk/obfuncs.h>
 #include <ndk/psfuncs.h>
@@ -51,9 +50,6 @@
 #include <fslib/ext2lib.h>
 #include <fslib/vfatlib.h>
 
-/* DDK Disk Headers */
-#include <ntddscsi.h>
-
 /* Internal Headers */
 #include "interface/consup.h"
 #include "partlist.h"
@@ -64,26 +60,15 @@
 #include "infros.h"
 #include "filequeue.h"
 #endif
-#include "bootsup.h"
 #include "registry.h"
 #include "fslist.h"
-#include "chkdsk.h"
-#include "format.h"
 #include "cabinet.h"
 #include "filesup.h"
-#include "drivesup.h"
 #include "genlist.h"
-#include "settings.h"
 #include "host.h"
 #include "mui.h"
 #include "errorcode.h"
 
-#define INITGUID
-#include <guiddef.h>
-#include <libs/umpnpmgr/sysguid.h>
-
-#include <zlib.h>
-
 extern HANDLE ProcessHeap;
 extern UNICODE_STRING SourceRootPath;
 extern UNICODE_STRING SourceRootDir;