* Slap *some* sense into our header inclusions.

* This significantly shrinks the dependency tracking data and the compiled objects size, which speeds up the whole build process (especially the incremental builds) accelerating the daily development as a result.
* No intended code changes, ~27% smaller build. Enjoy ;)

svn path=/trunk/; revision=58214

reactos/base/applications/atactl/atactl.cpp

@@ -1,6 +1,9 @@
-#include <windows.h>
+#include <stdarg.h>
+#include <windef.h>
+#include <winbase.h>
+#include <winreg.h>
 #include <winioctl.h>
-#include <stdio.h>
+#include <stdlib.h>
 //#include <ntdddisk.h>
 //#include <ntddscsi.h>
 #include <ntddscsi.h>

reactos/base/applications/cacls/cacls.c

@@ -17,7 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <precomp.h>
+#include "precomp.h"
 
 static GENERIC_MAPPING FileGenericMapping =
 {

reactos/base/applications/cacls/cacls.rc

@@ -1,4 +1,4 @@
-#include <windows.h>
+#include <windef.h>
 #include "resource.h"
 
 #define REACTOS_STR_FILE_DESCRIPTION	"ReactOS Control ACLs Program\0"

reactos/base/applications/cacls/precomp.h

@@ -1,10 +1,13 @@
 #ifndef _CACLS_PRECOMP_H
 #define _CACLS_PRECOMP_H
 
-#include <windows.h>
+#include <stdarg.h>
+#include <windef.h>
+#include <winbase.h>
+#include <winuser.h>
 #include <sddl.h>
 #include <tchar.h>
-#include <stdio.h>
+
 #include "resource.h"
 
 #endif /* _CACLS_PRECOMP_H */

reactos/base/applications/calc/calc.h

@@ -1,8 +1,12 @@
-
-#include <windows.h>
+#include <stdarg.h>
+#include <windef.h>
+#include <winbase.h>
+#include <winuser.h>
+#include <wingdi.h>
+#include <winreg.h>
 #include <tchar.h>
-#include <stdio.h>
-#include <string.h>
+//#include <stdio.h>
+//#include <string.h>
 #include <math.h>
 #include <float.h>
 #include <malloc.h>

reactos/base/applications/calc/resource.h

@@ -1,3 +1,5 @@
+#pragma once
+
 #define IDS_STRING_LICENSE              1
 #define IDS_MATH_ERROR                  2
 #define IDS_QUICKHELP                   3
@@ -376,4 +378,3 @@
 #define IDM_VIEW_BYTE                   40018
 #define IDM_VIEW_DWORD                  40019
 #define IDM_VIEW_CONVERSION             40020
-

reactos/base/applications/calc/resource.rc

@@ -18,7 +18,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <windows.h>
+#include <windef.h>
+#include <winuser.h>
 
 #include "resource.h"
 

reactos/base/applications/charmap/charmap.rc

@@ -1,6 +1,8 @@
-#include <windows.h>
-#include <commctrl.h>
+#include <windef.h>
+#include <winuser.h>
+//#include <commctrl.h>
 #include <richedit.h>
+
 #include "resource.h"
 
 LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL

reactos/base/applications/charmap/precomp.h

@@ -1,14 +1,19 @@
 #ifndef __CHARMAP_PRECOMP_H
 #define __CHARMAP_PRECOMP_H
 
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
+#include <stdarg.h>
+#include <windef.h>
+#include <winbase.h>
+#include <winuser.h>
+#include <winreg.h>
+#include <wingdi.h>
 #include <windowsx.h>
 #include <tchar.h>
-#include <stdio.h>
+//#include <stdio.h>
 #include <stdlib.h>
 #include <commctrl.h>
 #include <richedit.h>
+
 #include "resource.h"
 
 #define SIZEOF(_v)  (sizeof(_v) / sizeof(*_v))

reactos/base/applications/charmap/resource.h

@@ -1,3 +1,5 @@
+#pragma once
+
 #define IDC_STATIC          -1
 
 #define IDI_ICON            100

reactos/base/applications/cmdutils/dbgprint/dbgprint.c

@@ -8,9 +8,11 @@
  *                  Christoph von Wittich (Christoph_vW@ReactOS.org)
  */
 
-#include <windows.h>
+#include <stdarg.h>
+#include <windef.h>
+#include <winbase.h>
 #include <tchar.h>
-#include <debug.h>
+//#include <debug.h>
 #include <stdio.h>
 
 int _tmain(int argc, TCHAR ** argv)

reactos/base/applications/cmdutils/doskey/doskey.c

@@ -1,8 +1,13 @@
-#include <windows.h>
+#include <stdarg.h>
+#include <windef.h>
+#include <winbase.h>
+#include <winuser.h>
+#include <wincon.h>
 #include <stdio.h>
 #include <wchar.h>
 #include <assert.h>
 #include <locale.h>
+
 #include "doskey.h"
 
 #define MAX_STRING 2000

reactos/base/applications/cmdutils/doskey/doskey.h

@@ -1,3 +1,5 @@
+#pragma once
+
 #define IDS_HELP 0
 #define IDS_INVALID_MACRO_DEF 1
 

reactos/base/applications/cmdutils/doskey/doskey.rc

@@ -1,4 +1,5 @@
-#include <windows.h>
+#include <windef.h>
+
 #include "doskey.h"
 
 #define REACTOS_STR_FILE_DESCRIPTION	"W32 doskey command\0"

reactos/base/applications/cmdutils/find/find.c

@@ -27,20 +27,21 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
-#include <ctype.h>
-#include <windows.h>
+//#include <string.h>
+//#include <ctype.h>
 
-#include <io.h>
+#include <windef.h>
+#include <winbase.h>
+#include <winuser.h>
+
+//#include <io.h>
 #include <dos.h>
 
 #include "resource.h"
 
-
 /* Symbol definition */
 #define MAX_STR 1024
 
-
 /* This function prints out all lines containing a substring.  There are some
  * conditions that may be passed to the function.
  *
@@ -251,5 +252,3 @@ main (int argc, char **argv)
   */
   exit ( (ret ? 0 : 1) );
 }
-
-

reactos/base/applications/cmdutils/find/find.rc

@@ -1,3 +1,7 @@
+#include <windef.h>
+
+#include "resource.h"
+
 #define REACTOS_STR_FILE_DESCRIPTION	"W32 find command\0"
 #define REACTOS_STR_INTERNAL_NAME	"find\0"
 #define REACTOS_STR_ORIGINAL_FILENAME	"find.exe\0"

reactos/base/applications/cmdutils/find/resource.h

@@ -1,3 +1,5 @@
+#pragma once
+
 #define IDS_USAGE                 1000
 #define IDS_NO_SUCH_FILE          1001
 #define IDS_CANNOT_OPEN           1002

reactos/base/applications/cmdutils/find/rsrc.rc

@@ -1,6 +1,3 @@
-#include <windows.h>
-#include "resource.h"
-
 // UTF-8
 #pragma code_page(65001)
 #ifdef LANGUAGE_BG_BG

reactos/base/applications/cmdutils/hostname/hostname.c

@@ -23,10 +23,13 @@
  * FILE      : subsys/system/hostname/hostname.c
  * PROGRAMMER: Emanuele Aliberti (ea@reactos.com)
  */
-#include <windows.h>
+
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
+//#include <string.h>
+
+#include <windef.h>
+#include <winbase.h>
 
 int main (int argc, char ** argv)
 {

reactos/base/applications/cmdutils/lodctr/lodctr_main.c

@@ -16,7 +16,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <windows.h>
+#include <stdarg.h>
+#include <windef.h>
+#include <winbase.h>
 #include <loadperf.h>
 
 int wmain(int argc, WCHAR *argv[])

reactos/base/applications/cmdutils/more/more.c

@@ -1,5 +1,4 @@
-/* $Id$
- * 
+/*
  * MORE.C - external command.
  *
  * clone from 4nt more command
@@ -10,10 +9,15 @@
  *     use window size instead of buffer size.
  */
 
-#include <windows.h>
+#include <stdio.h>
 #include <malloc.h>
 #include <tchar.h>
-#include <stdio.h>
+
+#include <windef.h>
+#include <winbase.h>
+#include <winuser.h>
+#include <wincon.h>
+
 #include "resource.h"
 
 static TCHAR szCont[128];

reactos/base/applications/cmdutils/more/more.rc

@@ -1,4 +1,4 @@
-#include <windows.h>
+#include <windef.h>
 #include "resource.h"
 
 #define REACTOS_STR_FILE_DESCRIPTION	"W32 more command\0"

reactos/base/applications/cmdutils/reg/reg.c

@@ -16,8 +16,14 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <windows.h>
+#include <stdarg.h>
+#include <windef.h>
+#include <winbase.h>
+#include <winuser.h>
+#include <winreg.h>
+#include <wincon.h>
 #include <wine/unicode.h>
+
 #include "reg.h"
 
 static int reg_printfW(const WCHAR *msg, ...)

reactos/base/applications/cmdutils/reg/reg.h

@@ -18,7 +18,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <windef.h>
+#pragma once
+
+//#include <windef.h>
 
 /* Translation IDs. */
 #define STRING_USAGE            101

reactos/base/applications/cmdutils/reg/reg.rc

@@ -1,6 +1,7 @@
-#include <windows.h>
-#include <commctrl.h>
-#include "reg.h"
+#include <windef.h>
+//#include <commctrl.h>
+
+//#include "reg.h"
 
 /* Define language neutral resources */
 LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL

reactos/base/applications/cmdutils/reg/rsrc.rc

@@ -1,7 +1,3 @@
-#include <windows.h>
-#include "reg.h"
-
-/* Include localised resources */
 // UTF-8
 #pragma code_page(65001)
 #ifdef LANGUAGE_BG_BG

reactos/base/applications/cmdutils/xcopy/xcopy.c

@@ -39,11 +39,19 @@
  *   5 - Disk write error
  */
 
-
 #include <stdio.h>
-#include <windows.h>
+#include <stdlib.h>
+//#include <tchar.h>
+//#include <malloc.h>
+
+#include <windef.h>
+#include <winbase.h>
+#include <winuser.h>
+#include <winnls.h>
+#include <wincon.h>
 #include <wine/debug.h>
-#include <wine/unicode.h>
+//#include <wine/unicode.h>
+
 #include "xcopy.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(xcopy);

reactos/base/applications/cmdutils/xcopy/xcopy.h

@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#pragma once
+
 #include <windef.h>
 
 /* Local #defines */

reactos/base/applications/control/control.h

@@ -6,8 +6,13 @@
  *                  Colin Finck (mail@colinfinck.de)
  */
 
-#include <windows.h>
 #include <tchar.h>
+#include <windef.h>
+#include <winbase.h>
+#include <winuser.h>
+#include <winreg.h>
+#include <shellapi.h>
+
 #include "resource.h"
 
 #define CCH_UINT_MAX   11

reactos/base/applications/control/resource.h

@@ -1 +1,3 @@
+#pragma once
+
 #define IDI_MAINICON                    100

reactos/base/applications/dxdiag/d3dtest7.c

@@ -7,7 +7,7 @@
  */
 
 #include "precomp.h"
-#include <d3d.h>
+//#include <d3d.h>
 
 BOOL D3D7Test(HWND hWnd)
 {

reactos/base/applications/dxdiag/d3dtest8.c

@@ -7,7 +7,7 @@
  */
 
 #include "precomp.h"
-#include <d3d8.h>
+//#include <d3d8.h>
 
 BOOL D3D8Test(HWND hWnd)
 {

reactos/base/applications/dxdiag/d3dtest9.c

@@ -7,7 +7,7 @@
  */
 
 #include "precomp.h"
-#include <d3d9.h>
+//#include <d3d9.h>
 
 BOOL D3D9Test(HWND hWnd)
 {

reactos/base/applications/dxdiag/dxdiag.rc

@@ -1,4 +1,5 @@
-#include <windows.h>
+#include <windef.h>
+#include <winuser.h>
 #include <commctrl.h>
 
 #include "resource.h"

reactos/base/applications/dxdiag/precomp.h

@@ -6,18 +6,26 @@
 #define D3D_OVERLOADS
 
 #include <stdio.h>
-#include <windows.h>
-#include <limits.h>
+
+#define WIN32_NO_STATUS
+#define _INC_WINDOWS
+#define COM_NO_WINDOWS_H
+#include <stdarg.h>
+#include <windef.h>
+#include <winbase.h>
+#include <winreg.h>
+#include <winsvc.h>
+#include <wingdi.h>
+#include <winnls.h>
+#include <winver.h>
+#include <winuser.h>
 #include <mmsystem.h>
 #include <setupapi.h>
-#include <commctrl.h>
 #include <ddraw.h>
 #include <initguid.h>
 #include <devguid.h>
 #include <mmreg.h>
-#include <wintrust.h>
-#include <softpub.h>
-#include <mscat.h>
+
 #include "resource.h"
 
 typedef struct

reactos/base/applications/extrac32/extrac32.c

@@ -19,13 +19,13 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 #include <shellapi.h>
 #include <setupapi.h>
 #include <shlwapi.h>
-
-#include "wine/unicode.h"
-#include "wine/debug.h"
+#include <wine/unicode.h>
+#include <wine/debug.h>
 
 WINE_DEFAULT_DEBUG_CHANNEL(extrac32);
 

reactos/base/applications/findstr/findstr.c

@@ -27,16 +27,16 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
-#include <ctype.h>
-#include <windows.h>
-
-#include <io.h>
+//#include <string.h>
+//#include <ctype.h>
+#include <windef.h>
+#include <winbase.h>
+#include <winuser.h>
+//#include <io.h>
 #include <dos.h>
 
 #include "resource.h"
 
-
 /* Symbol definition */
 #define MAX_STR 1024
 

reactos/base/applications/findstr/findstr.rc

@@ -1,3 +1,7 @@
+#include <windef.h>
+
+#include "resource.h"
+
 #define REACTOS_STR_FILE_DESCRIPTION	"W32 findstr command\0"
 #define REACTOS_STR_INTERNAL_NAME	"findstr\0"
 #define REACTOS_STR_ORIGINAL_FILENAME	"findstr.exe\0"

reactos/base/applications/findstr/resource.h

@@ -1,3 +1,5 @@
+#pragma once
+
 #define IDS_USAGE                 1000
 #define IDS_NO_SUCH_FILE          1001
 #define IDS_CANNOT_OPEN           1002

reactos/base/applications/findstr/rsrc.rc

@@ -1,6 +1,3 @@
-#include <windows.h>
-#include "resource.h"
-
 // UTF-8
 #pragma code_page(65001)
 #ifdef LANGUAGE_BG_BG

reactos/base/applications/fontview/display.c

@@ -20,9 +20,6 @@
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include <windows.h>
-#include <stdio.h>
-
 #include "display.h"
 
 #define SPACING1 8

reactos/base/applications/fontview/display.h

@@ -1,5 +1,13 @@
 #pragma once
 
+#include <stdio.h>
+#include <stdlib.h>
+#include <windef.h>
+#include <winbase.h>
+#include <winuser.h>
+#include <wingdi.h>
+#include <commdlg.h>
+
 /* Messages for the display class */
 #define FVM_SETTYPEFACE WM_USER
 #define FVM_SETSTRING (WM_USER + 1)

reactos/base/applications/fontview/fontview.h

@@ -1,4 +1,7 @@
-#include <windows.h>
+#include <stdarg.h>
+#include <windef.h>
+#include <winbase.h>
+#include <shellapi.h>
 
 #include "resource.h"
 #include "display.h"

reactos/base/applications/fontview/fontview.rc

@@ -1,4 +1,5 @@
-#include <windows.h>
+#include <windef.h>
+
 #include "resource.h"
 
 LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL

reactos/base/applications/fontview/resource.h

@@ -1,3 +1,4 @@
+#pragma once
 
 #define IDS_ERROR 100
 #define IDS_ERROR_NOMEM 101
@@ -12,4 +13,3 @@
 #define IDS_CHARSLOWER 700
 #define IDS_CHARSUPPER 701
 #define IDS_SPECIALCHARS 702
-

reactos/base/applications/games/solitaire/resource.h

@@ -1,3 +1,4 @@
+#pragma once
 
 /* Icon */
 #define IDI_SOLITAIRE                   100

reactos/base/applications/games/solitaire/rsrc.rc

@@ -1,4 +1,6 @@
-#include <windows.h>
+#include <windef.h>
+#include <winuser.h>
+
 #include "resource.h"
 
 LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL

reactos/base/applications/games/solitaire/solitaire.h

@@ -1,11 +1,14 @@
-
-#include <windows.h>
+#define WIN32_NO_STATUS
+#include <stdarg.h>
+#include <windef.h>
+#include <winbase.h>
+#include <winreg.h>
+#include <winuser.h>
 #include <commctrl.h>
 #include <tchar.h>
-#include <stdio.h>
-#include <stdlib.h>
+#include <cardlib.h>
+
 #include "resource.h"
-#include "cardlib.h"
 
 extern CardWindow SolWnd;
 extern TCHAR szAppName[];

reactos/base/applications/games/spider/resource.h

@@ -1,3 +1,5 @@
+#pragma once
+
 /* Icon */
 #define IDI_SPIDER                      100
 
@@ -37,4 +39,3 @@
 #define IDS_SPI_QUIT                    1302
 #define IDS_SPI_WIN                     1303
 #define IDS_SPI_DEAL                    1304
-

reactos/base/applications/games/spider/rsrc.rc

@@ -1,4 +1,6 @@
-#include <windows.h>
+#include <windef.h>
+#include <winuser.h>
+
 #include "resource.h"
 
 LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL

reactos/base/applications/games/spider/spider.h

@@ -1,12 +1,13 @@
-
-#include <windows.h>
+#define WIN32_NO_STATUS
+#include <stdarg.h>
+#include <windef.h>
+#include <winbase.h>
+#include <winuser.h>
 #include <commctrl.h>
 #include <tchar.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include "resource.h"
-#include "cardlib.h"
+#include <cardlib.h>
 
+#include "resource.h"
 
 #define DIFFICULTY_ONE_COLOR     1
 #define DIFFICULTY_TWO_COLORS    2

reactos/base/applications/games/winmine/dialog.c

@@ -18,9 +18,10 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_LEAN_AND_MEAN
+#define WIN32_NO_STATUS
+#include <stdarg.h>
+#include <windef.h>
 
-#include <windows.h>
 #include "main.h"
 #include "resource.h"
 

reactos/base/applications/games/winmine/main.c

@@ -18,13 +18,16 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_LEAN_AND_MEAN
-
-#include <string.h>
+#define WIN32_NO_STATUS
+#include <stdarg.h>
+#include <windef.h>
+#include <winbase.h>
+#include <winreg.h>
+#include <wingdi.h>
 #include <time.h>
-#include <windows.h>
 #include <stdlib.h>
 #include <shellapi.h>
+
 #include "main.h"
 #include "resource.h"
 

reactos/base/applications/games/winmine/main.h

@@ -16,7 +16,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <windows.h>
+#pragma once
+
+#include <winuser.h>
 
 #define BEGINNER_MINES        10
 #define BEGINNER_COLS         9

reactos/base/applications/games/winmine/resource.h

@@ -18,8 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <windef.h>
-#include <winuser.h>
+#pragma once
 
 #define ID_TIMER        1000
 

reactos/base/applications/games/winmine/rsrc.rc

@@ -19,6 +19,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include <windef.h>
+#include <winuser.h>
+
 #include "resource.h"
 
 LANGUAGE LANG_NEUTRAL,SUBLANG_NEUTRAL

reactos/base/applications/hh/hh.rc

@@ -1,4 +1,4 @@
-#include <windows.h>
+//#include <windows.h>
 
 #define REACTOS_STR_FILE_DESCRIPTION	"ReactOS HTML Help Executable\0"
 #define REACTOS_STR_INTERNAL_NAME	"hh\0"
@@ -6,4 +6,3 @@
 #include <reactos/version.rc>
 
 2 ICON DISCARDABLE hh.ico
-

reactos/base/applications/hh/main.c

@@ -1,4 +1,6 @@
-#include <windows.h>
+#include <stdarg.h>
+#include <windef.h>
+#include <winbase.h>
 
 typedef int WINAPI DOWINMAIN(HMODULE hMod, LPSTR cmdline);
 

reactos/base/applications/iexplore/main.c

@@ -18,7 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <windows.h>
+#include <windef.h>
 
 extern DWORD WINAPI IEWinMain(LPSTR, int);
 

reactos/base/applications/kbswitch/kbswitch.h

@@ -1,7 +1,11 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <windows.h>
+#include <stdarg.h>
+#include <windef.h>
+#include <winbase.h>
 #include <winuser.h>
+#include <winnls.h>
+#include <winreg.h>
+#include <wingdi.h>
+#include <shellapi.h>
 #include <tchar.h>
 
 #include "resource.h"

reactos/base/applications/kbswitch/kbswitch.rc

@@ -1,5 +1,6 @@
+#include <windef.h>
+
 #include "resource.h"
-#include <windows.h>
 
 LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 

reactos/base/applications/kbswitch/resource.h

@@ -1,3 +1,5 @@
+#pragma once
+
 /* Icons */
 #define IDI_MAIN         100
 

reactos/base/applications/logoff/logoff.rc

@@ -1,4 +1,5 @@
-#include <windows.h>
+#include <windef.h>
+
 #include "resource.h"
 
 #define REACTOS_STR_FILE_DESCRIPTION	"ReactOS Logoff Utility\0"

reactos/base/applications/logoff/precomp.h

@@ -1,11 +1,16 @@
 #ifndef __SHUTDOWN_PRECOMP_H
 #define __SHUTDOWN_PRECOMP_H
 
+#include <stdarg.h>
+#include <windef.h>
+#include <winbase.h>
+#include <winuser.h>
+
 #include <stdio.h>
-#include <stdlib.h>
-#include <windows.h>
+//#include <stdlib.h>
 #include <tchar.h>
-#include <reason.h> //shutdown codes
+//#include <reason.h> //shutdown codes
+
 #include "resource.h"
 
 // misc.c

reactos/base/applications/logoff/resource.h

@@ -1,3 +1,5 @@
+#pragma once
+
 #define IDS_USAGE    1000
 #define IDS_LOGOFF_REMOTE	1001
 #define IDS_LOGOFF_LOCAL	1002

reactos/base/applications/magnify/magnifier.h

@@ -18,12 +18,14 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-//////////////////////////////////////////////////////////////////
-
-#include <windows.h>
-#include <commctrl.h>
+#include <stdarg.h>
+#include <windef.h>
+#include <winbase.h>
+#include <winuser.h>
+#include <winreg.h>
+#include <wingdi.h>
 #include <tchar.h>
-#include <shellapi.h>
+
 #include "resource.h"
 
 extern int iZoom;

reactos/base/applications/magnify/magnify.rc

@@ -1,5 +1,7 @@
+#include <windef.h>
+#include <winuser.h>
 
-#include "magnifier.h"
+#include "resource.h"
 
 LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 

reactos/base/applications/magnify/resource.h

@@ -1,3 +1,5 @@
+#pragma once
+
 #define IDC_STATIC                      -1
 
 #define IDI_ICON                        101

reactos/base/applications/magnify/rsrc.rc

@@ -1,6 +1,3 @@
-#include <windows.h>
-#include "resource.h"
-
 // UTF-8
 #pragma code_page(65001)
 

reactos/base/applications/mmc/mmc.rc

@@ -1,6 +1,5 @@
-/* $Id: sndvol32.rc 23239 2006-07-23 09:59:30Z janderwald $ */
+#include <windef.h>
 
-#include <windows.h>
 #include "resource.h"
 
 #define REACTOS_STR_FILE_DESCRIPTION	"ReactOS Management Console\0"

reactos/base/applications/mmc/precomp.h

@@ -1,8 +1,10 @@
-
-#include <windows.h>
+#include <stdarg.h>
+#include <windef.h>
+#include <winbase.h>
+#include <winuser.h>
 #include <commctrl.h>
-#include <shellapi.h>
 #include <tchar.h>
+
 #include "resource.h"
 
 /* console.c */

reactos/base/applications/mmc/rsrc.rc

@@ -1,6 +1,3 @@
-#include <windows.h>
-#include "resource.h"
-
 // UTF-8
 #pragma code_page(65001)
 

reactos/base/applications/mplay32/mplay32.h

@@ -1,4 +1,11 @@
-#include <windows.h>
+#include <stdarg.h>
+#include <windef.h>
+#include <winbase.h>
+#include <winuser.h>
+#include <wingdi.h>
+#include <commdlg.h>
+#include <shellapi.h>
+#include <mmsystem.h>
 #include <commctrl.h>
 #include <tchar.h>
 

reactos/base/applications/mplay32/mplay32.rc

@@ -1,4 +1,5 @@
-#include <windows.h>
+#include <windef.h>
+
 #include "resource.h"
 
 #define REACTOS_STR_FILE_DESCRIPTION	"ReactOS Multimedia Player\0"

reactos/base/applications/mplay32/rsrc.rc

@@ -1,6 +1,3 @@
-#include <windows.h>
-#include "resource.h"
-
 // UTF-8
 #pragma code_page(65001)
 #ifdef LANGUAGE_BG_BG

reactos/base/applications/msconfig/freeldrpage.c

@@ -7,7 +7,7 @@
  *                        2011      Gregor Schneider <Gregor.Schneider@reactos.org>
  */
 
-#include <precomp.h>
+#include "precomp.h"
 
 HWND hFreeLdrPage;
 HWND hFreeLdrDialog;

reactos/base/applications/msconfig/generalpage.c

@@ -7,7 +7,7 @@
  *
  */
 
-#include <precomp.h>
+#include "precomp.h"
 
 HWND hGeneralPage;
 HWND hGeneralDialog;

reactos/base/applications/msconfig/msconfig.c

@@ -6,7 +6,7 @@
  * COPYRIGHT:   Copyright 2005-2006 Christoph von Wittich <Christoph@ApiViewer.de>
  *
  */
-#include <precomp.h>
+#include "precomp.h"
 
 HINSTANCE hInst = 0;
 

reactos/base/applications/msconfig/msconfig.h

@@ -1,2 +1 @@
 extern HINSTANCE hInst;
-

reactos/base/applications/msconfig/msconfig.rc

@@ -1,9 +1,9 @@
-#include <windows.h>
+#include <windef.h>
+#include <winuser.h>
 #include <commctrl.h>
 
 #include "resource.h"
 
-
 LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 
 #define REACTOS_VERSION_DLL
@@ -15,5 +15,3 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 IDI_APPICON   ICON "res/msconfig.ico"
 
 #include "rsrc.rc"
-
-

reactos/base/applications/msconfig/precomp.h

@@ -1,7 +1,13 @@
-#include <windows.h>
+#define WIN32_NO_STATUS
+#define _INC_WINDOWS
+#define COM_NO_WINDOWS_H
 #define NTOS_MODE_USER
-#include <commctrl.h>
-#include <winuser.h>
+#include <stdarg.h>
+#include <windef.h>
+#include <winbase.h>
+#include <winreg.h>
+#include <winsvc.h>
+#include <winver.h>
 #include <tchar.h>
 #include <stdio.h>
 #include <shlwapi.h>
@@ -18,5 +24,3 @@
 
 #define MAX_KEY_LENGTH 255
 #define MAX_VALUE_NAME 16383
-
-

reactos/base/applications/msconfig/resource.h

@@ -1,3 +1,5 @@
+#pragma once
+
 #define IDD_MSCONFIG_DIALOG              101
 #define IDD_TOOLS_PAGE                   102
 #define IDD_SERVICES_PAGE                103

reactos/base/applications/msconfig/rsrc.rc

@@ -1,6 +1,3 @@
-#include <windows.h>
-#include "resource.h"
-
 /* define language neutral resources */
 
 LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL

reactos/base/applications/msconfig/srvpage.c

@@ -7,7 +7,7 @@
  *
  */
 
-#include <precomp.h>
+#include "precomp.h"
 
 HWND hServicesPage;
 HWND hServicesListCtrl;

reactos/base/applications/msconfig/startuppage.c

@@ -7,7 +7,7 @@
  *
  */
 
-#include <precomp.h>
+#include "precomp.h"
 
 HWND hStartupPage;
 HWND hStartupListCtrl;

reactos/base/applications/msconfig/systempage.c

@@ -6,7 +6,7 @@
  * COPYRIGHT:   Copyright 2005-2006 Christoph von Wittich <Christoph@ApiViewer.de>
  *                        2011      Gregor Schneider <Gregor.Schneider@reactos.org>
  */
-#include <precomp.h>
+#include "precomp.h"
 
 HWND hSystemPage;
 HWND hSystemDialog;

reactos/base/applications/msconfig/toolspage.c

@@ -7,7 +7,7 @@
  *
  */
 
-#include <precomp.h>
+#include "precomp.h"
 
 HWND hToolsPage;
 HWND hToolsListCtrl;

reactos/base/applications/mscutils/devmgmt/devmgmt.rc

@@ -1,5 +1,6 @@
-#include <windows.h>
-#include <commctrl.h>
+#include <windef.h>
+#include <winuser.h>
+
 #include "resource.h"
 
 #define REACTOS_STR_FILE_DESCRIPTION  "ReactOS Device Manager\0"

reactos/base/applications/mscutils/devmgmt/precomp.h

@@ -1,18 +1,20 @@
 #ifndef __DEVMGMT_PRECOMP_H
 #define __DEVMGMT_PRECOMP_H
 
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
+#include <stdarg.h>
+#include <windef.h>
+#include <winbase.h>
+#include <winuser.h>
+#include <winreg.h>
+#include <wingdi.h>
 #include <windowsx.h>
-#include <stdio.h>
 #include <tchar.h>
 #include <setupapi.h>
 #include <cfgmgr32.h>
-#include <commctrl.h>
 #include <dll/devmgr/devmgr.h>
 #include <initguid.h>
-#include <cguid.h>
 #include <devguid.h>
+
 #include "resource.h"
 
 #ifdef _MSC_VER

reactos/base/applications/mscutils/devmgmt/resource.h

@@ -1,3 +1,5 @@
+#pragma once
+
 #define IDC_STATIC          -1
 
 #define IDI_MAIN_ICON       50

reactos/base/applications/mscutils/devmgmt/rsrc.rc

@@ -1,6 +1,3 @@
-#include <windows.h>
-#include "resource.h"
-
 LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 
 IDI_MAIN_ICON   ICON    "res/computer.ico"

reactos/base/applications/mscutils/eventvwr/eventvwr.c

@@ -23,11 +23,16 @@
  * PROGRAMMER: Marc Piulachs (marc.piulachs at codexchange [dot] net)
  */
 
-#include "eventvwr.h"
-#include <windows.h>
-#include <commctrl.h>
 #include <stdio.h>
-#include <time.h>
+#include <stdlib.h>
+#include <windef.h>
+#include <winbase.h>
+#include <winuser.h>
+#include <winnls.h>
+#include <winreg.h>
+#include <commctrl.h>
+
+#include "resource.h"
 
 #if _MSC_VER
     #pragma warning(disable: 4996)   /* 'strdup' was declared deprecated */

reactos/base/applications/mscutils/eventvwr/eventvwr.rc

@@ -1,7 +1,7 @@
-#include <windows.h>
-#include <commctrl.h>
-#include "resource.h"
+#include <windef.h>
+#include <winuser.h>
 
+#include "resource.h"
 
 #define REACTOS_STR_FILE_DESCRIPTION  "ReactOS Event Log Viewer\0"
 #define REACTOS_STR_INTERNAL_NAME     "eventvwr\0"
@@ -9,5 +9,3 @@
 #include <reactos/version.rc>
 
 #include "rsrc.rc"
-
-

reactos/base/applications/mscutils/eventvwr/resource.h

@@ -1,3 +1,5 @@
+#pragma once
+
 #define IDC_MYICON                      2
 #define IDNEXT                          3
 #define IDD_EVENTVWR_DIALOG             102
@@ -66,4 +68,3 @@
 
 #define IDS_NONE                        320
 #define IDS_NOT_AVAILABLE               321
-

reactos/base/applications/mscutils/eventvwr/rsrc.rc

@@ -1,6 +1,3 @@
-#include <windows.h>
-#include "resource.h"
-
 LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 
 // Shared icons

reactos/base/applications/mscutils/servman/control.c

@@ -133,7 +133,6 @@ DoControl(PMAIN_WND_INFO Info,
     return bRet;
 }
 
-
 BOOL
 DoPause(PMAIN_WND_INFO Info)
 {
@@ -158,7 +157,6 @@ DoPause(PMAIN_WND_INFO Info)
     return bRet;
 }
 
-
 BOOL
 DoResume(PMAIN_WND_INFO Info)
 {

reactos/base/applications/mscutils/servman/create.c

@@ -80,7 +80,6 @@ DoCreate(PCREATE_DATA Data)
     return bRet;
 }
 
-
 static LPTSTR
 GetStringFromDialog(PCREATE_DATA Data,
                     UINT id)
@@ -111,7 +110,6 @@ GetStringFromDialog(PCREATE_DATA Data,
     return lpString;
 }
 
-
 static BOOL
 GetDataFromDialog(PCREATE_DATA Data)
 {
@@ -163,7 +161,6 @@ FreeMemory(PCREATE_DATA Data)
              Data);
 }
 
-
 INT_PTR CALLBACK
 CreateHelpDialogProc(HWND hDlg,
                      UINT message,
@@ -220,7 +217,6 @@ CreateHelpDialogProc(HWND hDlg,
     return FALSE;
 }
 
-
 INT_PTR CALLBACK
 CreateDialogProc(HWND hDlg,
                  UINT message,

reactos/base/applications/mscutils/servman/delete.c

@@ -55,7 +55,6 @@ DoDeleteService(PMAIN_WND_INFO Info,
     return bRet;
 }
 
-
 INT_PTR CALLBACK
 DeleteDialogProc(HWND hDlg,
                  UINT message,

reactos/base/applications/mscutils/servman/dependencies_tv1.c

@@ -9,7 +9,6 @@
 
 #include "precomp.h"
 
-
 LPTSTR
 TV1_GetDependants(PSERVICEPROPSHEET pDlgInfo,
                   SC_HANDLE hService)
@@ -180,7 +179,6 @@ TV1_AddDependantsToTree(PSERVICEPROPSHEET pDlgInfo,
     }
 }
 
-
 BOOL
 TV1_Initialize(PSERVICEPROPSHEET pDlgInfo,
                LPTSTR lpServiceName)

reactos/base/applications/mscutils/servman/dependencies_tv2.c

@@ -9,7 +9,6 @@
 
 #include "precomp.h"
 
-
 BOOL
 TV2_HasDependantServices(LPWSTR lpServiceName)
 {
@@ -50,7 +49,6 @@ TV2_HasDependantServices(LPWSTR lpServiceName)
     return bRet;
 }
 
-
 LPENUM_SERVICE_STATUS
 TV2_GetDependants(LPWSTR lpServiceName,
                   LPDWORD lpdwCount)
@@ -117,7 +115,6 @@ TV2_GetDependants(LPWSTR lpServiceName,
     return lpDependencies;
 }
 
-
 VOID
 TV2_AddDependantsToTree(PSERVICEPROPSHEET pDlgInfo,
                         HTREEITEM hParent,