diff --git a/include/dmusbuff.h b/include/dmusbuff.h
index ba5b776ad88..7632b1aea4d 100644
--- a/include/dmusbuff.h
+++ b/include/dmusbuff.h
@@ -20,6 +20,8 @@
 #ifndef __WINE_DMUSIC_BUFFER_H
 #define __WINE_DMUSIC_BUFFER_H
 
+#include <dmdls.h>
+
 /*****************************************************************************
  * Misc. definitions
  */
diff --git a/include/dpnathlp.h b/include/dpnathlp.h
index c1fa3c917ba..81d32b3187a 100644
--- a/include/dpnathlp.h
+++ b/include/dpnathlp.h
@@ -19,6 +19,8 @@
 #ifndef __DPNATHLP_H__
 #define __DPNATHLP_H__
 
+#include <ole2.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/include/fdi.h b/include/fdi.h
index b77cd486ab7..f36baaf40d1 100644
--- a/include/fdi.h
+++ b/include/fdi.h
@@ -19,6 +19,8 @@
 #ifndef __WINE_FDI_H
 #define __WINE_FDI_H
 
+#include <basetsd.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif /* defined(__cplusplus) */
diff --git a/include/lmwksta.h b/include/lmwksta.h
index 6bc2faff626..b35f28a1b56 100644
--- a/include/lmwksta.h
+++ b/include/lmwksta.h
@@ -20,6 +20,7 @@
 #define __WINE_LMWKSTA_H
 
 #include <lmcons.h>
+#include <lmuseflg.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/ntddndis.h b/include/ntddndis.h
index 44566e861e9..5085f25cc6c 100644
--- a/include/ntddndis.h
+++ b/include/ntddndis.h
@@ -23,8 +23,8 @@
 extern "C" {
 #endif
 
-/* #include <ifdef.h>*/
-/* #include <devpkey.h> */
+#include <ifdef.h>
+#include <devpkey.h>
 /* #include <pciprop.h> */
 
 #define _NDIS_CONTROL_CODE(request, method) \
diff --git a/include/propvarutil.h b/include/propvarutil.h
index fe7ab940d34..96265a505a8 100644
--- a/include/propvarutil.h
+++ b/include/propvarutil.h
@@ -19,7 +19,6 @@
 #ifndef __WINE_PROPVARUTIL_H
 #define __WINE_PROPVARUTIL_H
 
-#include <propidl.h>
 #include <shtypes.h>
 #include <shlwapi.h>
 
diff --git a/include/setupapi.h b/include/setupapi.h
index baa5787e911..04ddc75d329 100644
--- a/include/setupapi.h
+++ b/include/setupapi.h
@@ -21,6 +21,7 @@
 #define _INC_SETUPAPI
 
 #include <commctrl.h>
+#include <devpropdef.h>
 
 #ifdef _WIN64
 #include <pshpack8.h>
diff --git a/include/winineti.h b/include/winineti.h
index 6419204ecca..8029155336a 100644
--- a/include/winineti.h
+++ b/include/winineti.h
@@ -21,6 +21,7 @@
 
 /* FIXME: #include <iedial.h> */
 #include <schannel.h>
+#include <sspi.h>
 
 typedef struct _INTERNET_CACHE_CONFIG_PATH_ENTRYA
 {