diff --git a/reactos/base/system/diskpart/assign.c b/reactos/base/system/diskpart/assign.c
index bbb6b670deb..fd3010d8156 100644
--- a/reactos/base/system/diskpart/assign.c
+++ b/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)
diff --git a/reactos/base/system/diskpart/attach.c b/reactos/base/system/diskpart/attach.c
index 13d2d652bfc..5fe98b1dd80 100644
--- a/reactos/base/system/diskpart/attach.c
+++ b/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)
diff --git a/reactos/base/system/diskpart/attributes.c b/reactos/base/system/diskpart/attributes.c
index 52d17c9141b..0d70c7e2819 100644
--- a/reactos/base/system/diskpart/attributes.c
+++ b/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)
diff --git a/reactos/base/system/diskpart/automount.c b/reactos/base/system/diskpart/automount.c
index a3ee0033f0c..822f01b10ae 100644
--- a/reactos/base/system/diskpart/automount.c
+++ b/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)
diff --git a/reactos/base/system/diskpart/break.c b/reactos/base/system/diskpart/break.c
index 86bdbc70b56..9672889f20d 100644
--- a/reactos/base/system/diskpart/break.c
+++ b/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)
diff --git a/reactos/base/system/diskpart/clean.c b/reactos/base/system/diskpart/clean.c
index 58b81b451d2..ad02870e7df 100644
--- a/reactos/base/system/diskpart/clean.c
+++ b/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)
diff --git a/reactos/base/system/diskpart/compact.c b/reactos/base/system/diskpart/compact.c
index 413d1b133f0..9b2999a2ee1 100644
--- a/reactos/base/system/diskpart/compact.c
+++ b/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)
diff --git a/reactos/base/system/diskpart/convert.c b/reactos/base/system/diskpart/convert.c
index 429edb4dfec..90b44f95237 100644
--- a/reactos/base/system/diskpart/convert.c
+++ b/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)
diff --git a/reactos/base/system/diskpart/create.c b/reactos/base/system/diskpart/create.c
index 71e4197ba45..fa63697590b 100644
--- a/reactos/base/system/diskpart/create.c
+++ b/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)
diff --git a/reactos/base/system/diskpart/delete.c b/reactos/base/system/diskpart/delete.c
index a1359e17d8b..32c3a987f87 100644
--- a/reactos/base/system/diskpart/delete.c
+++ b/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)
diff --git a/reactos/base/system/diskpart/detach.c b/reactos/base/system/diskpart/detach.c
index 9bf1494c4e4..747e63ec040 100644
--- a/reactos/base/system/diskpart/detach.c
+++ b/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)
diff --git a/reactos/base/system/diskpart/detail.c b/reactos/base/system/diskpart/detail.c
index ff2a3fc0fa0..4ddea062d2f 100644
--- a/reactos/base/system/diskpart/detail.c
+++ b/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)
diff --git a/reactos/base/system/diskpart/diskpart.c b/reactos/base/system/diskpart/diskpart.c
index 2f5231692b8..bb27c49b9c3 100644
--- a/reactos/base/system/diskpart/diskpart.c
+++ b/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, ...)
diff --git a/reactos/base/system/diskpart/diskpart.h b/reactos/base/system/diskpart/diskpart.h
index d9df7c55288..f4590f49d3a 100644
--- a/reactos/base/system/diskpart/diskpart.h
+++ b/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"
 
diff --git a/reactos/base/system/diskpart/diskpart.rc b/reactos/base/system/diskpart/diskpart.rc
index 4ddedbee49a..0b46ba41190 100644
--- a/reactos/base/system/diskpart/diskpart.rc
+++ b/reactos/base/system/diskpart/diskpart.rc
@@ -19,4 +19,4 @@
 #endif
 #ifdef LANGUAGE_SQ_AL
     #include "lang/sq-AL.rc"
-#endif
\ No newline at end of file
+#endif
diff --git a/reactos/base/system/diskpart/expand.c b/reactos/base/system/diskpart/expand.c
index 895e145f632..77af227dff0 100644
--- a/reactos/base/system/diskpart/expand.c
+++ b/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)
diff --git a/reactos/base/system/diskpart/extend.c b/reactos/base/system/diskpart/extend.c
index 4b524f80aaf..6bd14c2b25a 100644
--- a/reactos/base/system/diskpart/extend.c
+++ b/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)
diff --git a/reactos/base/system/diskpart/filesystems.c b/reactos/base/system/diskpart/filesystems.c
index 651d3a46e42..10d2a54a8bd 100644
--- a/reactos/base/system/diskpart/filesystems.c
+++ b/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)
diff --git a/reactos/base/system/diskpart/format.c b/reactos/base/system/diskpart/format.c
index c87a74f5015..af66072bf34 100644
--- a/reactos/base/system/diskpart/format.c
+++ b/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)
diff --git a/reactos/base/system/diskpart/gpt.c b/reactos/base/system/diskpart/gpt.c
index fad7cbb31a1..bc86c542131 100644
--- a/reactos/base/system/diskpart/gpt.c
+++ b/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)
diff --git a/reactos/base/system/diskpart/import.c b/reactos/base/system/diskpart/import.c
index 273e69deeca..ee32762c9fd 100644
--- a/reactos/base/system/diskpart/import.c
+++ b/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)
diff --git a/reactos/base/system/diskpart/inactive.c b/reactos/base/system/diskpart/inactive.c
index 4cffbaeac99..55910d0010e 100644
--- a/reactos/base/system/diskpart/inactive.c
+++ b/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)
diff --git a/reactos/base/system/diskpart/list.c b/reactos/base/system/diskpart/list.c
index 289caf8c128..be234f5dcc2 100644
--- a/reactos/base/system/diskpart/list.c
+++ b/reactos/base/system/diskpart/list.c
@@ -6,6 +6,7 @@
  *                  an interactive way
  * PROGRAMMERS:     Lee Schroeder
  */
+
 #include "diskpart.h"
 
 static VOID list_disk(VOID)
diff --git a/reactos/base/system/diskpart/merge.c b/reactos/base/system/diskpart/merge.c
index 13e883f5e03..cb9b10230e6 100644
--- a/reactos/base/system/diskpart/merge.c
+++ b/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)
diff --git a/reactos/base/system/diskpart/offline.c b/reactos/base/system/diskpart/offline.c
index cfab4bcad39..8644a6f87da 100644
--- a/reactos/base/system/diskpart/offline.c
+++ b/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)
diff --git a/reactos/base/system/diskpart/online.c b/reactos/base/system/diskpart/online.c
index bb99bc088c8..d474f1cd98e 100644
--- a/reactos/base/system/diskpart/online.c
+++ b/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)
diff --git a/reactos/base/system/diskpart/recover.c b/reactos/base/system/diskpart/recover.c
index 28669baa1d8..49000bb246b 100644
--- a/reactos/base/system/diskpart/recover.c
+++ b/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)
diff --git a/reactos/base/system/diskpart/remove.c b/reactos/base/system/diskpart/remove.c
index a2cd0a338a9..1997c3542cb 100644
--- a/reactos/base/system/diskpart/remove.c
+++ b/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)
diff --git a/reactos/base/system/diskpart/repair.c b/reactos/base/system/diskpart/repair.c
index 8d3c1bb36bc..92945dc2e15 100644
--- a/reactos/base/system/diskpart/repair.c
+++ b/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)
diff --git a/reactos/base/system/diskpart/rescan.c b/reactos/base/system/diskpart/rescan.c
index e141b64c485..a2ab962a8ae 100644
--- a/reactos/base/system/diskpart/rescan.c
+++ b/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)
diff --git a/reactos/base/system/diskpart/retain.c b/reactos/base/system/diskpart/retain.c
index ce8951f223e..941d67eeaf5 100644
--- a/reactos/base/system/diskpart/retain.c
+++ b/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)
diff --git a/reactos/base/system/diskpart/san.c b/reactos/base/system/diskpart/san.c
index 09b66e7a372..fa29dbeeaa9 100644
--- a/reactos/base/system/diskpart/san.c
+++ b/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)
diff --git a/reactos/base/system/diskpart/select.c b/reactos/base/system/diskpart/select.c
index 37106e0b793..3c37dd6a8f4 100644
--- a/reactos/base/system/diskpart/select.c
+++ b/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)
diff --git a/reactos/base/system/diskpart/setid.c b/reactos/base/system/diskpart/setid.c
index c3c1e004675..8226a82eaaf 100644
--- a/reactos/base/system/diskpart/setid.c
+++ b/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)
diff --git a/reactos/base/system/diskpart/shrink.c b/reactos/base/system/diskpart/shrink.c
index cf7253a9a8c..b940d6dc9d5 100644
--- a/reactos/base/system/diskpart/shrink.c
+++ b/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)
diff --git a/reactos/base/system/diskpart/uniqueid.c b/reactos/base/system/diskpart/uniqueid.c
index 168d950d01c..3d11a844008 100644
--- a/reactos/base/system/diskpart/uniqueid.c
+++ b/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)