include: Don't use idl file for dxgitype.h.

.gitignore

@@ -171,7 +171,6 @@ include/docobj.h
 include/docobjectservice.h
 include/downloadmgr.h
 include/dxgi.h
-include/dxgitype.h
 include/endpointvolume.h
 include/exdisp.h
 include/fusion.h

include/Makefile.in

@@ -32,7 +32,6 @@ PUBLIC_IDL_H_SRCS = \
 	docobjectservice.idl \
 	downloadmgr.idl \
 	dxgi.idl \
-	dxgitype.idl \
 	endpointvolume.idl \
 	exdisp.idl \
 	fusion.idl \
@@ -257,6 +256,7 @@ SRCDIR_INCLUDES = \
 	dxerr9.h \
 	dxfile.h \
 	dxgiformat.h \
+	dxgitype.h \
 	dyngraph.idl \
 	errorrep.h \
 	errors.h \

include/dxgi.idl

@@ -16,7 +16,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-import "dxgitype.idl";
+import "oaidl.idl";
+import "ocidl.idl";
+import "dxgitype.h";
 
 const UINT _FACDXGI = 0x87a;
 

include/dxgitype.h

@@ -15,9 +15,11 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
-import "oaidl.idl";
-import "ocidl.idl";
-import "dxgiformat.h";
+
+#ifndef __dxgitype_h__
+#define __dxgitype_h__
+
+#include "dxgiformat.h"
 
 typedef struct DXGI_SAMPLE_DESC {
     UINT Count;
@@ -78,3 +80,5 @@ typedef struct DXGI_GAMMA_CONTROL {
     DXGI_RGB Offset;
     DXGI_RGB GammaCurve[1025];
 } DXGI_GAMMA_CONTROL;
+
+#endif