diff --git a/reactos/base/applications/calc/calc.h b/reactos/base/applications/calc/calc.h
index 905d0741d94..64ee624cbc7 100644
--- a/reactos/base/applications/calc/calc.h
+++ b/reactos/base/applications/calc/calc.h
@@ -1,3 +1,6 @@
+#ifndef _CALC_H
+#define _CALC_H
+
 #include <stdarg.h>
 #include <windef.h>
 #include <winuser.h>
@@ -225,3 +228,5 @@ INT_PTR CALLBACK AboutDlgProc(HWND hWnd, UINT msg, WPARAM wp, LPARAM lp);
 void ConvExecute(HWND hWnd);
 void ConvAdjust(HWND hWnd, int n_cat);
 void ConvInit(HWND hWnd);
+
+#endif /* _CALC_H */
diff --git a/reactos/base/applications/games/solitaire/solitaire.h b/reactos/base/applications/games/solitaire/solitaire.h
index f2b60736ad5..cc9c960f01d 100644
--- a/reactos/base/applications/games/solitaire/solitaire.h
+++ b/reactos/base/applications/games/solitaire/solitaire.h
@@ -1,3 +1,6 @@
+#ifndef _SOL_PCH_
+#define _SOL_PCH_
+
 #include <cardlib.h>
 
 extern CardWindow SolWnd;
@@ -52,3 +55,5 @@ void CARDLIBPROC DeckClickProc(CardRegion &stackobj, int iNumClicked);
 void CARDLIBPROC PileDblClickProc(CardRegion &stackobj, int iNumClicked);
 
 void CARDLIBPROC PileRemoveProc(CardRegion &stackobj, int iRemoved);
+
+#endif /* _SOL_PCH_ */
diff --git a/reactos/base/applications/games/spider/spider.h b/reactos/base/applications/games/spider/spider.h
index 72998888aea..69c0b80d1d4 100644
--- a/reactos/base/applications/games/spider/spider.h
+++ b/reactos/base/applications/games/spider/spider.h
@@ -1,3 +1,6 @@
+#ifndef _SPIDER_PCH_
+#define _SPIDER_PCH_
+
 #include <cardlib.h>
 
 #include "resource.h"
@@ -39,3 +42,5 @@ void CARDLIBPROC DeckClickProc(CardRegion &stackobj, int iNumClicked);
 void CARDLIBPROC PileDblClickProc(CardRegion &stackobj, int iNumClicked);
 
 void CARDLIBPROC PileRemoveProc(CardRegion &stackobj, int iRemoved);
+
+#endif /* _SPIDER_PCH_ */
diff --git a/reactos/base/applications/games/winmine/main.h b/reactos/base/applications/games/winmine/main.h
index eeb45ed0109..826940b7957 100644
--- a/reactos/base/applications/games/winmine/main.h
+++ b/reactos/base/applications/games/winmine/main.h
@@ -16,7 +16,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#pragma once
+#ifndef _WINMINE_H_
+#define _WINMINE_H_
 
 #include <stdarg.h>
 
@@ -136,5 +137,4 @@ INT_PTR CALLBACK CongratsDlgProc( HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lP
 
 INT_PTR CALLBACK TimesDlgProc( HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam );
 
-
-/* end of header */
+#endif /* _WINMINE_H_ */
diff --git a/reactos/base/applications/magnify/magnifier.h b/reactos/base/applications/magnify/magnifier.h
index b45d4441aaa..b543cb7e0d9 100644
--- a/reactos/base/applications/magnify/magnifier.h
+++ b/reactos/base/applications/magnify/magnifier.h
@@ -18,6 +18,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+#ifndef _MAGNIFIER_H_
+#define _MAGNIFIER_H_
+
 #include <stdarg.h>
 #include <windef.h>
 
@@ -35,3 +38,5 @@ extern BOOL bShowMagnifier;
 
 void LoadSettings(void);
 void SaveSettings(void);
+
+#endif /* _MAGNIFIER_H_ */
diff --git a/reactos/base/applications/mmc/precomp.h b/reactos/base/applications/mmc/precomp.h
index ebb66b7b5c8..cf252fc2e2d 100644
--- a/reactos/base/applications/mmc/precomp.h
+++ b/reactos/base/applications/mmc/precomp.h
@@ -1,3 +1,6 @@
+#ifndef _MMC_PCH_
+#define _MMC_PCH_
+
 #include <stdarg.h>
 
 #include <windef.h>
@@ -37,3 +40,5 @@ extern HINSTANCE hAppInstance;
 extern HANDLE hAppHeap;
 extern HWND hwndMainConsole;
 extern HWND hwndMDIClient;
+
+#endif /* _MMC_PCH_ */
diff --git a/reactos/base/applications/msconfig/msconfig.h b/reactos/base/applications/msconfig/msconfig.h
index 9acfadda02f..d36e41c62ae 100644
--- a/reactos/base/applications/msconfig/msconfig.h
+++ b/reactos/base/applications/msconfig/msconfig.h
@@ -1 +1,3 @@
+#pragma once
+
 extern HINSTANCE hInst;
diff --git a/reactos/base/applications/msconfig/precomp.h b/reactos/base/applications/msconfig/precomp.h
index 5aea3aa0d85..6b54525aefb 100644
--- a/reactos/base/applications/msconfig/precomp.h
+++ b/reactos/base/applications/msconfig/precomp.h
@@ -1,3 +1,6 @@
+#ifndef _MSCONFIG_PCH_
+#define _MSCONFIG_PCH_
+
 #include <stdarg.h>
 
 #define WIN32_NO_STATUS
@@ -18,3 +21,5 @@
 
 #define MAX_KEY_LENGTH 255
 #define MAX_VALUE_NAME 16383
+
+#endif /* _MSCONFIG_PCH_ */
diff --git a/reactos/base/applications/mspaint/precomp.h b/reactos/base/applications/mspaint/precomp.h
index c35d7513002..bc5032f3b91 100644
--- a/reactos/base/applications/mspaint/precomp.h
+++ b/reactos/base/applications/mspaint/precomp.h
@@ -1,3 +1,6 @@
+#ifndef _MSPAINT_H
+#define _MSPAINT_H
+
 #include <stdarg.h>
 
 #include <windef.h>
@@ -17,3 +20,5 @@
 #include "globalvar.h"
 #include "history.h"
 #include "mouse.h"
+
+#endif /* _MSPAINT_H */
diff --git a/reactos/base/applications/mstsc/precomp.h b/reactos/base/applications/mstsc/precomp.h
index 628b7de3c78..9c31a05aaa8 100644
--- a/reactos/base/applications/mstsc/precomp.h
+++ b/reactos/base/applications/mstsc/precomp.h
@@ -1,3 +1,6 @@
+#ifndef _MSTSC_PCH_
+#define _MSTSC_PCH_
+
 #include <stdarg.h>
 
 #define WIN32_NO_STATUS
@@ -106,3 +109,5 @@ BOOL SetStringToSettings(PRDPSETTINGS pRdpSettings, LPWSTR lpKey, LPWSTR lpValue
 VOID SaveAllSettings(PINFO pInfo);
 
 #endif /* __TODO_MSTSC_H */
+
+#endif /* _MSTSC_PCH_ */
diff --git a/reactos/base/applications/network/finger/precomp.h b/reactos/base/applications/network/finger/precomp.h
index 2c13e2355d8..2f87dad6880 100644
--- a/reactos/base/applications/network/finger/precomp.h
+++ b/reactos/base/applications/network/finger/precomp.h
@@ -1,8 +1,14 @@
+#ifndef _FINGER_PCH_
+#define _FINGER_PCH_
+
+#include <stdio.h>
+#include <stdlib.h>
+
 #define WIN32_NO_STATUS
 #include <windef.h>
 #define _INC_WINDOWS
 #include <winsock2.h>
-#include <stdio.h>
-#include <stdlib.h>
 
 #include "err.h"
+
+#endif /* _FINGER_PCH_ */
diff --git a/reactos/base/applications/network/ftp/precomp.h b/reactos/base/applications/network/ftp/precomp.h
index bdd7b8539d7..58cbb9e6f7d 100644
--- a/reactos/base/applications/network/ftp/precomp.h
+++ b/reactos/base/applications/network/ftp/precomp.h
@@ -1,3 +1,6 @@
+#ifndef _FTP_H
+#define _FTP_H
+
 #include <sys/stat.h>
 
 #ifndef _WIN32
@@ -27,3 +30,5 @@
 #include <stdlib.h>
 
 #include "ftp_var.h"
+
+#endif /* _FTP_H */
diff --git a/reactos/base/applications/network/net/cmdHelpMsg.c b/reactos/base/applications/network/net/cmdHelpMsg.c
index 57e893998cf..d7766c0a1cf 100644
--- a/reactos/base/applications/network/net/cmdHelpMsg.c
+++ b/reactos/base/applications/network/net/cmdHelpMsg.c
@@ -8,7 +8,8 @@
  */
 
 #include "net.h"
-#include "stdlib.h"
+
+#include <stdlib.h>
 
 INT cmdHelpMsg(INT argc, WCHAR **argv)
 {
diff --git a/reactos/base/applications/network/net/net.h b/reactos/base/applications/network/net/net.h
index 7c8ea0d25d7..4df059b8428 100644
--- a/reactos/base/applications/network/net/net.h
+++ b/reactos/base/applications/network/net/net.h
@@ -1,13 +1,14 @@
 /*
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS net command 
- * FILE:            
- * PURPOSE:         
- *
  * PROGRAMMERS:     Magnus Olsen (greatlord@reactos.org)
  */
 
+#ifndef _NET_PCH_
+#define _NET_PCH_
+
 #include <stdarg.h>
+
 #include <windef.h>
 #include <winbase.h>
 #include <winsvc.h>
@@ -22,3 +23,5 @@ INT cmdHelpMsg(INT argc, WCHAR **argv);
 INT cmdPause(INT argc, WCHAR **argv);
 INT cmdStart(INT argc, WCHAR **argv);
 INT cmdStop(INT argc, WCHAR **argv);
+
+#endif /* _NET_PCH_ */
diff --git a/reactos/base/applications/network/nslookup/nslookup.h b/reactos/base/applications/network/nslookup/nslookup.h
index d6b10ec5d5b..9bd8781537d 100644
--- a/reactos/base/applications/network/nslookup/nslookup.h
+++ b/reactos/base/applications/network/nslookup/nslookup.h
@@ -1,3 +1,6 @@
+#ifndef _NSLOOKUP_H
+#define _NSLOOKUP_H
+
 #include <stdarg.h>
 
 #define WIN32_NO_STATUS
@@ -111,3 +114,5 @@ PCHAR   TypeIDtoTypeName( USHORT TypeID );
 USHORT  TypeNametoTypeID( PCHAR TypeName );
 PCHAR   ClassIDtoClassName( USHORT ClassID );
 USHORT  ClassNametoClassID( PCHAR ClassName );
+
+#endif /* _NSLOOKUP_H */
diff --git a/reactos/base/applications/network/telnet/precomp.h b/reactos/base/applications/network/telnet/precomp.h
index 603c8164e92..c678b12c462 100644
--- a/reactos/base/applications/network/telnet/precomp.h
+++ b/reactos/base/applications/network/telnet/precomp.h
@@ -1,3 +1,6 @@
+#ifndef _TELNET_PCH_
+#define _TELNET_PCH_
+
 #include <stdarg.h>
 
 #define WIN32_NO_STATUS
@@ -27,3 +30,5 @@
 #include "src/tnclass.h"
 #include "src/tnmisc.h"
 #include "src/tncon.h"
+
+#endif /* _TELNET_PCH_ */
diff --git a/reactos/base/applications/notepad/notepad.h b/reactos/base/applications/notepad/notepad.h
index da3cae573a2..cbddce7a406 100644
--- a/reactos/base/applications/notepad/notepad.h
+++ b/reactos/base/applications/notepad/notepad.h
@@ -1,3 +1,6 @@
+#ifndef _NOTEPAD_H
+#define _NOTEPAD_H
+
 #ifndef STRSAFE_NO_DEPRECATE
 #define STRSAFE_NO_DEPRECATE
 #endif
@@ -16,3 +19,5 @@
 
 #include "main.h"
 #include "dialog.h"
+
+#endif /* _NOTEPAD_H */
diff --git a/reactos/base/applications/rapps/rapps.h b/reactos/base/applications/rapps/rapps.h
index 7d29c2fdcb6..269e7dd405a 100644
--- a/reactos/base/applications/rapps/rapps.h
+++ b/reactos/base/applications/rapps/rapps.h
@@ -1,3 +1,6 @@
+#ifndef _RAPPS_H
+#define _RAPPS_H
+
 #include <stdarg.h>
 
 #define WIN32_NO_STATUS
@@ -195,3 +198,5 @@ VOID ToolBarOnGetDispInfo(LPTOOLTIPTEXT lpttt);
 extern HWND hTreeView;
 BOOL CreateTreeView(HWND hwnd);
 HTREEITEM TreeViewAddItem(HTREEITEM hParent, LPWSTR lpText, INT Image, INT SelectedImage, LPARAM lParam);
+
+#endif /* _RAPPS_H */
diff --git a/reactos/base/applications/sc/sc.h b/reactos/base/applications/sc/sc.h
index 086ca90dfaa..3d00b5cacca 100644
--- a/reactos/base/applications/sc/sc.h
+++ b/reactos/base/applications/sc/sc.h
@@ -1,3 +1,6 @@
+#ifndef _SC_PCH_
+#define _SC_PCH_
+
 #include <stdarg.h>
 
 #include <windef.h>
@@ -32,3 +35,5 @@ VOID DescriptionUsage(VOID);
 VOID DeleteUsage(VOID);
 VOID CreateUsage(VOID);
 VOID ControlUsage(VOID);
+
+#endif /* _SC_PCH_ */
diff --git a/reactos/base/applications/screensavers/3dtext/3dtext.h b/reactos/base/applications/screensavers/3dtext/3dtext.h
index 93b78c60cbb..269552f1418 100644
--- a/reactos/base/applications/screensavers/3dtext/3dtext.h
+++ b/reactos/base/applications/screensavers/3dtext/3dtext.h
@@ -18,6 +18,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+#ifndef _3DTEXT_H_
+#define _3DTEXT_H_
+
 #include <tchar.h>
 #include <windef.h>
 
@@ -25,3 +28,5 @@ extern TCHAR m_Text[MAX_PATH];
 
 VOID LoadSettings(VOID);
 VOID SaveSettings(VOID);
+
+#endif /* _3DTEXT_H_ */
diff --git a/reactos/base/applications/sndrec32/stdafx.h b/reactos/base/applications/sndrec32/stdafx.h
index b7467459dda..56cff0c35d2 100644
--- a/reactos/base/applications/sndrec32/stdafx.h
+++ b/reactos/base/applications/sndrec32/stdafx.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef _SNDREC32_PCH_
+#define _SNDREC32_PCH_
 
 //#include "targetver.h"
 
@@ -16,3 +17,5 @@
 #include <winbase.h>
 #include <wingdi.h>
 #include <winuser.h>
+
+#endif /* _SNDREC32_PCH_ */
diff --git a/reactos/base/applications/winhlp32/winhelp.h b/reactos/base/applications/winhlp32/winhelp.h
index b98c04f95fa..ae0b92030d4 100644
--- a/reactos/base/applications/winhlp32/winhelp.h
+++ b/reactos/base/applications/winhlp32/winhelp.h
@@ -20,6 +20,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#ifndef _WINHELP_H_
+#define _WINHELP_H_
+
 #define MAX_LANGUAGE_NUMBER     255
 #define MAX_STRING_LEN          255
 
@@ -203,3 +206,5 @@ extern const char STRING_DIALOG_TEST[];
 
 /* Buttons */
 #define WH_FIRST_BUTTON     500
+
+#endif /* _WINHELP_H_ */