include: Add DO_NO_IMPORTS ifdefs where needed.

include/activscp.idl

@@ -16,9 +16,11 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#ifndef DO_NO_IMPORTS
 import "ocidl.idl";
 import "oleidl.idl";
 import "oaidl.idl";
+#endif
  
 typedef enum tagSCRIPTSTATE {
     SCRIPTSTATE_UNINITIALIZED = 0,

include/comcat.idl

@@ -17,7 +17,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#ifndef DO_NO_IMPORTS
 import "unknwn.idl";
+#endif
 
 /*****************************************************************************
  * Types

include/dispex.idl

@@ -16,10 +16,12 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#ifndef DO_NO_IMPORTS
 import "ocidl.idl";
 import "oleidl.idl";
 import "oaidl.idl";
 import "servprov.idl";
+#endif
 
 cpp_quote("#define fdexNameCaseSensitive       0x00000001L")
 cpp_quote("#define fdexNameEnsure              0x00000002L")

include/mlang.idl

@@ -16,7 +16,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#ifndef DO_NO_IMPORTS
 import "unknwn.idl";
+#endif
 
 interface IStream;
 

include/msxml.idl

@@ -19,11 +19,12 @@
 
 #include <msxmldid.h>
 
+#ifndef DO_NO_IMPORTS
 import "unknwn.idl";
 import "wtypes.idl";
 import "objidl.idl";
 import "oaidl.idl";
-
+#endif
 
 [
 local,

include/oaidl.idl

@@ -16,7 +16,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#ifndef DO_NO_IMPORTS
 import "objidl.idl";
+#endif
 
 interface IDispatch;
 interface ITypeInfo;

include/objidl.idl

@@ -16,7 +16,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#ifndef DO_NO_IMPORTS
 import "unknwn.idl";
+#endif
 
 interface IStream;
 interface IEnumString;

include/objsafe.idl

@@ -16,7 +16,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#ifndef DO_NO_IMPORTS
 import "unknwn.idl";
+#endif
 
 cpp_quote("#define INTERFACESAFE_FOR_UNTRUSTED_CALLER 1")
 cpp_quote("#define INTERFACESAFE_FOR_UNTRUSTED_DATA 2")

include/ocidl.idl

@@ -18,11 +18,12 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#ifndef DO_NO_IMPORTS
 import "oleidl.idl";
 import "oaidl.idl";
 import "servprov.idl";
 import "urlmon.idl";
-
+#endif
 
 /*****************************************************************************
  * IOleControlTypes interface

include/oleidl.idl

@@ -18,7 +18,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#ifndef DO_NO_IMPORTS
 import "objidl.idl";
+#endif
 
 interface IOleInPlaceActiveObject;
 

include/propidl.idl

@@ -18,9 +18,10 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#ifndef DO_NO_IMPORTS
 import "objidl.idl";
 import "oaidl.idl";
-
+#endif
 
 /*
  * Windows SDK braindamage alert

include/unknwn.idl

@@ -16,7 +16,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#ifndef DO_NO_IMPORTS
 import "wtypes.idl";
+#endif
 
 /* Interfaces */