[DISKPART]

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

svn path=/trunk/; revision=61612

reactos/base/system/diskpart/assign.c

@@ -5,6 +5,7 @@
  * PURPOSE:         Manages all the partitions of the OS in an interactive way
  * PROGRAMMERS:     Lee Schroeder
  */
+
 #include "diskpart.h"
 
 BOOL assign_main(INT argc, LPWSTR *argv)

reactos/base/system/diskpart/attach.c

@@ -5,6 +5,7 @@
  * PURPOSE:         Manages all the partitions of the OS in an interactive way
  * PROGRAMMERS:     Lee Schroeder
  */
+
 #include "diskpart.h"
 
 BOOL attach_main(INT argc, LPWSTR *argv)

reactos/base/system/diskpart/attributes.c

@@ -5,6 +5,7 @@
  * PURPOSE:         Manages all the partitions of the OS in an interactive way
  * PROGRAMMERS:     Lee Schroeder
  */
+
 #include "diskpart.h"
 
 BOOL attributes_main(INT argc, LPWSTR *argv)

reactos/base/system/diskpart/automount.c

@@ -5,6 +5,7 @@
  * PURPOSE:         Manages all the partitions of the OS in an interactive way
  * PROGRAMMERS:     Lee Schroeder
  */
+
 #include "diskpart.h"
 
 BOOL automount_main(INT argc, LPWSTR *argv)

reactos/base/system/diskpart/break.c

@@ -6,6 +6,7 @@
  *					an interactive way
  * PROGRAMMERS:     Lee Schroeder
  */
+
 #include "diskpart.h"
 
 BOOL break_main(INT argc, LPWSTR *argv)

reactos/base/system/diskpart/clean.c

@@ -6,6 +6,7 @@
  *					an interactive way
  * PROGRAMMERS:     Lee Schroeder
  */
+
 #include "diskpart.h"
 
 BOOL clean_main(INT argc, LPWSTR *argv)

reactos/base/system/diskpart/compact.c

@@ -6,6 +6,7 @@
  *					an interactive way
  * PROGRAMMERS:     Lee Schroeder
  */
+
 #include "diskpart.h"
 
 BOOL compact_main(INT argc, LPWSTR *argv)

reactos/base/system/diskpart/convert.c

@@ -6,6 +6,7 @@
  *					an interactive way
  * PROGRAMMERS:     Lee Schroeder
  */
+
 #include "diskpart.h"
 
 BOOL convert_main(INT argc, LPWSTR *argv)

reactos/base/system/diskpart/create.c

@@ -6,6 +6,7 @@
  *					an interactive way
  * PROGRAMMERS:     Lee Schroeder
  */
+
 #include "diskpart.h"
 
 BOOL create_main(INT argc, LPWSTR *argv)

reactos/base/system/diskpart/delete.c

@@ -6,6 +6,7 @@
  *					an interactive way
  * PROGRAMMERS:     Lee Schroeder
  */
+
 #include "diskpart.h"
 
 BOOL delete_main(INT argc, LPWSTR *argv)

reactos/base/system/diskpart/detach.c

@@ -6,6 +6,7 @@
  *					an interactive way
  * PROGRAMMERS:     Lee Schroeder
  */
+
 #include "diskpart.h"
 
 BOOL detach_main(INT argc, LPWSTR *argv)

reactos/base/system/diskpart/detail.c

@@ -6,6 +6,7 @@
  *					an interactive way
  * PROGRAMMERS:     Lee Schroeder
  */
+
 #include "diskpart.h"
 
 BOOL detail_main(INT argc, LPWSTR *argv)

reactos/base/system/diskpart/diskpart.c

@@ -8,8 +8,14 @@
  */
 
 /* INCLUDES ******************************************************************/
+
 #include "diskpart.h"
 
+#include <stdlib.h>
+#include <winbase.h>
+#include <wincon.h>
+#include <winuser.h>
+
 /* FUNCTIONS ******************************************************************/
 VOID
 PrintResourceString(INT resID, ...)

reactos/base/system/diskpart/diskpart.h

@@ -6,19 +6,16 @@
  *                  an interactive way
  * PROGRAMMERS:     Lee Schroeder
  */
+
 #ifndef DISKPART_H
 #define DISKPART_H
 
 /* INCLUDES ******************************************************************/
 
-#define WIN32_NO_STATUS
-#include <stdarg.h>
-#include <windef.h>
-#include <winbase.h>
-#include <wincon.h>
-#include <winuser.h>
 #include <stdio.h>
-#include <stdlib.h>
+
+#define WIN32_NO_STATUS
+#include <windef.h>
 
 #include "resource.h"
 

reactos/base/system/diskpart/diskpart.rc

@@ -19,4 +19,4 @@
 #endif
 #ifdef LANGUAGE_SQ_AL
     #include "lang/sq-AL.rc"
-#endif
+#endif

reactos/base/system/diskpart/expand.c

@@ -6,6 +6,7 @@
  *					an interactive way
  * PROGRAMMERS:     Lee Schroeder
  */
+
 #include "diskpart.h"
 
 BOOL expand_main(INT argc, LPWSTR *argv)

reactos/base/system/diskpart/extend.c

@@ -6,6 +6,7 @@
  *					an interactive way
  * PROGRAMMERS:     Lee Schroeder
  */
+
 #include "diskpart.h"
 
 BOOL extend_main(INT argc, LPWSTR *argv)

reactos/base/system/diskpart/filesystems.c

@@ -6,6 +6,7 @@
  *					an interactive way
  * PROGRAMMERS:     Lee Schroeder
  */
+
 #include "diskpart.h"
 
 BOOL filesystems_main(INT argc, LPWSTR *argv)

reactos/base/system/diskpart/format.c

@@ -6,6 +6,7 @@
  *                  an interactive way
  * PROGRAMMERS:     Lee Schroeder
  */
+
 #include "diskpart.h"
 
 BOOL format_main(INT argc, LPWSTR *argv)

reactos/base/system/diskpart/gpt.c

@@ -6,6 +6,7 @@
  *					an interactive way
  * PROGRAMMERS:     Lee Schroeder
  */
+
 #include "diskpart.h"
 
 BOOL gpt_main(INT argc, LPWSTR *argv)

reactos/base/system/diskpart/import.c

@@ -6,6 +6,7 @@
  *					an interactive way
  * PROGRAMMERS:     Lee Schroeder
  */
+
 #include "diskpart.h"
 
 BOOL import_main(INT argc, LPWSTR *argv)

reactos/base/system/diskpart/inactive.c

@@ -6,6 +6,7 @@
  *					an interactive way
  * PROGRAMMERS:     Lee Schroeder
  */
+
 #include "diskpart.h"
 
 BOOL inactive_main(INT argc, LPWSTR *argv)

reactos/base/system/diskpart/list.c

@@ -6,6 +6,7 @@
  *                  an interactive way
  * PROGRAMMERS:     Lee Schroeder
  */
+
 #include "diskpart.h"
 
 static VOID list_disk(VOID)

reactos/base/system/diskpart/merge.c

@@ -6,6 +6,7 @@
  *					an interactive way
  * PROGRAMMERS:     Lee Schroeder
  */
+
 #include "diskpart.h"
 
 BOOL merge_main(INT argc, LPWSTR *argv)

reactos/base/system/diskpart/offline.c

@@ -6,6 +6,7 @@
  *					an interactive way
  * PROGRAMMERS:     Lee Schroeder
  */
+
 #include "diskpart.h"
 
 BOOL offline_main(INT argc, LPWSTR *argv)

reactos/base/system/diskpart/online.c

@@ -6,6 +6,7 @@
  *					an interactive way
  * PROGRAMMERS:     Lee Schroeder
  */
+
 #include "diskpart.h"
 
 BOOL online_main(INT argc, LPWSTR *argv)

reactos/base/system/diskpart/recover.c

@@ -6,6 +6,7 @@
  *					an interactive way
  * PROGRAMMERS:     Lee Schroeder
  */
+
 #include "diskpart.h"
 
 BOOL recover_main(INT argc, LPWSTR *argv)

reactos/base/system/diskpart/remove.c

@@ -6,6 +6,7 @@
  *					an interactive way
  * PROGRAMMERS:     Lee Schroeder
  */
+
 #include "diskpart.h"
 
 BOOL remove_main(INT argc, LPWSTR *argv)

reactos/base/system/diskpart/repair.c

@@ -6,6 +6,7 @@
  *					an interactive way
  * PROGRAMMERS:     Lee Schroeder
  */
+
 #include "diskpart.h"
 
 BOOL repair_main(INT argc, LPWSTR *argv)

reactos/base/system/diskpart/rescan.c

@@ -6,6 +6,7 @@
  *					an interactive way
  * PROGRAMMERS:     Lee Schroeder
  */
+
 #include "diskpart.h"
 
 BOOL rescan_main(INT argc, LPWSTR *argv)

reactos/base/system/diskpart/retain.c

@@ -6,6 +6,7 @@
  *					an interactive way
  * PROGRAMMERS:     Lee Schroeder
  */
+
 #include "diskpart.h"
 
 BOOL retain_main(INT argc, LPWSTR *argv)

reactos/base/system/diskpart/san.c

@@ -6,6 +6,7 @@
  *					an interactive way
  * PROGRAMMERS:     Lee Schroeder
  */
+
 #include "diskpart.h"
 
 BOOL san_main(INT argc, LPWSTR *argv)

reactos/base/system/diskpart/select.c

@@ -6,6 +6,7 @@
  *					an interactive way
  * PROGRAMMERS:     Lee Schroeder
  */
+
 #include "diskpart.h"
 
 BOOL select_main(INT argc, LPWSTR *argv)

reactos/base/system/diskpart/setid.c

@@ -6,6 +6,7 @@
  *					an interactive way
  * PROGRAMMERS:     Lee Schroeder
  */
+
 #include "diskpart.h"
 
 BOOL setid_main(INT argc, LPWSTR *argv)

reactos/base/system/diskpart/shrink.c

@@ -6,6 +6,7 @@
  *					an interactive way
  * PROGRAMMERS:     Lee Schroeder
  */
+
 #include "diskpart.h"
 
 BOOL shrink_main(INT argc, LPWSTR *argv)

reactos/base/system/diskpart/uniqueid.c

@@ -6,6 +6,7 @@
  *					an interactive way
  * PROGRAMMERS:     Lee Schroeder
  */
+
 #include "diskpart.h"
 
 BOOL uniqueid_main(INT argc, LPWSTR *argv)