diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog
index 4dc23f1df..8e2b9ebe3 100644
--- a/winsup/w32api/ChangeLog
+++ b/winsup/w32api/ChangeLog
@@ -1,3 +1,15 @@
+2006-04-14  Dimitri Papadopoulos  <papadopo@users.sourceforge.net>
+
+	* include/wsahelp.h (system_header): Add pragma.
+	* include/ws2spi.h (system_header): Add pragma.
+	* include/rasdlg.h (system_header): Add pragma.
+	* include/rasdlg.h (_RASDLG_H): Define.
+	Define instead of _RASDLG_H_, this is the w32api standard.
+	* include/mlang.h (_MLANG_H): Define.
+	Define instead of _MLANG_H_, this is the w32api standard.
+	* include/setupapi.h (_SETUPAPI_H): Define.
+	Define instead of _SETUPAPI_H_, this is the w32api standard.
+
 2006-04-14  Dimitri Papadopoulos  <papadopo@users.sourceforge.net>
 
 	* include/rpcndr.h (boolean): Add typedef.
diff --git a/winsup/w32api/include/mlang.h b/winsup/w32api/include/mlang.h
index e7b3444ed..b09066d60 100755
--- a/winsup/w32api/include/mlang.h
+++ b/winsup/w32api/include/mlang.h
@@ -1,5 +1,5 @@
-#ifndef _MLANG_H_
-#define _MLANG_H_
+#ifndef _MLANG_H
+#define _MLANG_H
 #if __GNUC__ >= 3
 #pragma GCC system_header
 #endif
@@ -346,5 +346,4 @@ DECLARE_INTERFACE_(IMultiLanguage2,IUnknown)
 #ifdef __cplusplus
 }
 #endif
-
-#endif /* ndef _MLANG_H_ */
+#endif
diff --git a/winsup/w32api/include/rasdlg.h b/winsup/w32api/include/rasdlg.h
index b0f4c1417..6ba20da4b 100644
--- a/winsup/w32api/include/rasdlg.h
+++ b/winsup/w32api/include/rasdlg.h
@@ -1,5 +1,9 @@
-#ifndef _RASDLG_H_
-#define _RASDLG_H_
+#ifndef _RASDLG_H
+#define _RASDLG_H
+#if __GNUC__ >= 3
+#pragma GCC system_header
+#endif
+
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/winsup/w32api/include/setupapi.h b/winsup/w32api/include/setupapi.h
index 269884124..4b2ed1e0b 100644
--- a/winsup/w32api/include/setupapi.h
+++ b/winsup/w32api/include/setupapi.h
@@ -1,5 +1,5 @@
-#ifndef _SETUPAPI_H_
-#define _SETUPAPI_H_
+#ifndef _SETUPAPI_H
+#define _SETUPAPI_H
 #if __GNUC__ >=3
 #pragma GCC system_header
 #endif
@@ -1573,7 +1573,5 @@ WINSETUPAPI BOOL WINAPI SetupTerminateFileLog(HSPFILELOG);
 #ifdef __cplusplus
 }
 #endif
-
 #include <poppack.h>
-#endif /* _SETUPAPI_H_ */
-
+#endif
diff --git a/winsup/w32api/include/ws2spi.h b/winsup/w32api/include/ws2spi.h
index fe7425e59..4f7a01e9d 100644
--- a/winsup/w32api/include/ws2spi.h
+++ b/winsup/w32api/include/ws2spi.h
@@ -17,6 +17,9 @@
  */
 #ifndef _WS2SPI_H
 #define _WS2SPI_H
+#if __GNUC__ >= 3
+#pragma GCC system_header
+#endif
 
 #include <winsock2.h>
 
@@ -196,5 +199,4 @@ INT WSPAPI WSCWriteProviderOrder(LPDWORD,DWORD);
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */
-
-#endif /* _WS2SPI_H */
+#endif
diff --git a/winsup/w32api/include/wsahelp.h b/winsup/w32api/include/wsahelp.h
index bcdeba87d..8ff876e04 100644
--- a/winsup/w32api/include/wsahelp.h
+++ b/winsup/w32api/include/wsahelp.h
@@ -1,5 +1,8 @@
 #ifndef _WSAHELP_H
 #define _WSAHELP_H
+#if __GNUC__ >= 3
+#pragma GCC system_header
+#endif
 
 #include <winsock2.h>
 #include <ntsecapi.h>
@@ -92,5 +95,4 @@ typedef DWORD (WINAPI *PWSH_GET_WINSOCK_MAPPING)(PWINSOCK_MAPPING,DWORD);
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */
-
-#endif /* _WSAHELP_H */
+#endif