diff --git a/include/d3d10.idl b/include/d3d10.idl
index 51b92bdd1e0..ac9894212e7 100644
--- a/include/d3d10.idl
+++ b/include/d3d10.idl
@@ -1592,7 +1592,9 @@ interface ID3D10Multithread : IUnknown
         BOOL GetMultithreadProtected();
 }
 
+cpp_quote("#ifndef D3D10_IGNORE_SDK_LAYERS")
+cpp_quote("/* FIXME: # include <d3d10sdklayers.h> */")
+cpp_quote("#endif")
 cpp_quote("#include \"d3d10misc.h\"")
 cpp_quote("#include \"d3d10shader.h\"")
 cpp_quote("#include \"d3d10effect.h\"")
-/* TODO: Include "d310sdklayers.h" as soon as it exists */
diff --git a/include/d3d10_1.idl b/include/d3d10_1.idl
index 5724b63b169..11c52b468e3 100644
--- a/include/d3d10_1.idl
+++ b/include/d3d10_1.idl
@@ -20,6 +20,8 @@ import "oaidl.idl";
 import "ocidl.idl";
 
 import "d3d10.idl";
+cpp_quote("#include <d3d10_1shader.h>")
+
 
 typedef enum D3D10_FEATURE_LEVEL1
 {
diff --git a/include/d3d11.idl b/include/d3d11.idl
index 5959010aca1..80b929c7731 100644
--- a/include/d3d11.idl
+++ b/include/d3d11.idl
@@ -21,6 +21,16 @@ import "ocidl.idl";
 import "dxgi.idl";
 import "d3dcommon.idl";
 
+cpp_quote("#include <d3d10_1.h>")
+cpp_quote("#ifndef D3D11_IGNORE_SDK_LAYERS")
+cpp_quote("/* FIXME: # include <d3d11sdklayers.h> */")
+cpp_quote("#endif")
+cpp_quote("#include <d3d10misc.h>")
+cpp_quote("#include <d3d10shader.h>")
+cpp_quote("#include <d3d10effect.h>")
+cpp_quote("#include <d3d10_1shader.h>")
+
+
 typedef D3D_SRV_DIMENSION D3D11_SRV_DIMENSION;
 
 typedef D3D_PRIMITIVE D3D11_PRIMITIVE;