[akhaldi] 61609: [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

Author: akhaldi
Date: Mon Jan 13 13:01:38 2014
New Revision: 61609

URL: http://svn.reactos.org/svn/reactos?rev=61609&view=rev
Log:
[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

Modified:
    trunk/reactos/base/setup/usetup/cabinet.c
    trunk/reactos/base/setup/usetup/interface/devinst.c
    trunk/reactos/base/setup/usetup/interface/usetup.c
    trunk/reactos/base/setup/usetup/partlist.c
    trunk/reactos/base/setup/usetup/usetup.h

Modified: trunk/reactos/base/setup/usetup/cabinet.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/cabinet.…
==============================================================================
--- trunk/reactos/base/setup/usetup/cabinet.c	[iso-8859-1] (original)
+++ trunk/reactos/base/setup/usetup/cabinet.c	[iso-8859-1] Mon Jan 13 13:01:38 2014
@@ -9,6 +9,8 @@
  */
 
 #include "usetup.h"
+
+#include <zlib.h>
 
 #define NDEBUG
 #include <debug.h>

Modified: trunk/reactos/base/setup/usetup/interface/devinst.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/interfac…
==============================================================================
--- trunk/reactos/base/setup/usetup/interface/devinst.c	[iso-8859-1] (original)
+++ trunk/reactos/base/setup/usetup/interface/devinst.c	[iso-8859-1] Mon Jan 13 13:01:38
2014
@@ -10,6 +10,10 @@
 
 #define NDEBUG
 #include <debug.h>
+
+#define INITGUID
+#include <guiddef.h>
+#include <libs/umpnpmgr/sysguid.h>
 
 BOOLEAN
 ResetDevice(

Modified: trunk/reactos/base/setup/usetup/interface/usetup.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/interfac…
==============================================================================
--- trunk/reactos/base/setup/usetup/interface/usetup.c	[iso-8859-1] (original)
+++ trunk/reactos/base/setup/usetup/interface/usetup.c	[iso-8859-1] Mon Jan 13 13:01:38
2014
@@ -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>
 

Modified: trunk/reactos/base/setup/usetup/partlist.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/partlist…
==============================================================================
--- trunk/reactos/base/setup/usetup/partlist.c	[iso-8859-1] (original)
+++ trunk/reactos/base/setup/usetup/partlist.c	[iso-8859-1] Mon Jan 13 13:01:38 2014
@@ -25,6 +25,8 @@
  */
 
 #include "usetup.h"
+
+#include <ntddscsi.h>
 
 #define NDEBUG
 #include <debug.h>

Modified: trunk/reactos/base/setup/usetup/usetup.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/usetup.h…
==============================================================================
--- trunk/reactos/base/setup/usetup/usetup.h	[iso-8859-1] (original)
+++ trunk/reactos/base/setup/usetup/usetup.h	[iso-8859-1] Mon Jan 13 13:01:38 2014
@@ -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>
@@ -50,9 +49,6 @@
 /* Filesystem headers */
 #include <fslib/ext2lib.h>
 #include <fslib/vfatlib.h>
-
-/* DDK Disk Headers */
-#include <ntddscsi.h>
 
 /* Internal Headers */
 #include "interface/consup.h"
@@ -64,25 +60,14 @@
 #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;