Updated the #include directives to match the latest Windows SDK and to

include our new headers.

diff --git a/include/rpc.h b/include/rpc.h
index 60d1b05..6bc48f0 100644 (file)
--- a/include/rpc.h
+++ b/include/rpc.h
@@ -64,7 +64,7 @@ RPC_STATUS RPC_ENTRY UuidCreate(UUID *Uuid);
 #include "rpcdce.h"
 /* #include "rpcnsi.h" */
 #include "rpcnterr.h"
-/* #include "excpt.h" */
+#include "excpt.h"
 #include "winerror.h"
 
 #endif /*__WINE_RPC_H */

diff --git a/include/windows.h b/include/windows.h
index 4862c1e..54b1024 100644 (file)
--- a/include/windows.h
+++ b/include/windows.h
@@ -53,32 +53,35 @@
 #include "dlgs.h"
 #include "lzexpand.h"
 #include "mmsystem.h"
-/* #include "nb30.h" */
+#include "nb30.h"
 #include "rpc.h"
 #include "shellapi.h"
 /* #include "winperf.h" */
 
 #ifndef WINE_NOWINSOCK
 #include "winsock2.h"
-/* #include "mswsock.h" */
 #endif /* WINE_NOWINSOCK */
 
 #ifndef NOCRYPT
 #include "wincrypt.h"
+/* #include "winefs.h" */
+/* #include "winscard.h" */
 #endif /* !NOCRYPT */
 
 #ifndef NOGDI
-#include "commdlg.h"
 #include "winspool.h"
 #ifdef INC_OLE1
 #include "ole.h"
 #else
 #include "ole2.h"
 #endif
+#include "commdlg.h"
 #endif /* !NOGDI */
 
 #endif /* !WIN32_LEAN_AND_MEAN */
 
+/* #include "stralign.h" */
+
 #ifdef INC_OLE2
 #include "ole2.h"
 #endif /* INC_OLE2 */