[ARMDDK]

[reactos.git] / include / psdk / windows.h

diff --git a/include/psdk/windows.h b/include/psdk/windows.h
index 34ab88d..3422398 100644 (file)
--- a/include/psdk/windows.h
+++ b/include/psdk/windows.h
@@ -12,9 +12,6 @@
 */
 #ifndef _WINDOWS_H
 #define _WINDOWS_H
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
 
 #ifdef __GNUC__
 #include <msvctarget.h>
@@ -43,13 +40,9 @@
 #include <stdarg.h>
 #include <windef.h>
 #include <winbase.h>
-#if !(defined NOGDI || defined  _WINGDI_H)
 #include <wingdi.h>
-#endif
-#include <wincon.h>
-#ifndef _WINUSER_H
 #include <winuser.h>
-#endif
+#include <wincon.h>
 #ifndef _WINNLS_H
 #include <winnls.h>
 #endif
@@ -78,6 +71,11 @@
 #include <rpc.h>
 #include <shellapi.h>
 #include <winperf.h>
+#ifndef NOCRYPT
+#include <wincrypt.h>
+#include <winefs.h>
+#include <winscard.h>
+#endif
 #ifndef NOGDI
 #include <commdlg.h>
 #include <winspool.h>
@@ -103,7 +101,7 @@
 #endif
 #ifndef NOGDI
 #if !defined (__OBJC__)
-#if (__GNUC__ >= 3) || defined (__WATCOMC__)
+#if (defined(__GNUC__) && (__GNUC__ >= 3)) || defined (__WATCOMC__) || defined(_MSC_VER)
 #include <ole2.h>
 #endif
 #endif /* __OBJC__ */