Moved the instance creation of GUID's to a new file.

ole/Makefile.in

@@ -7,6 +7,7 @@ MODULE    = ole
 
 C_SRCS = \
 	compobj.c \
+	guid.c \
 	ifs.c \
 	moniker.c \
 	ole2.c \

ole/compobj.c

@@ -27,12 +27,12 @@
 #ifdef HAVE_NETINET_IN_H
 # include <netinet/in.h>
 #endif
-#include <ctype.h>
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
 #include "windows.h"
 #include "winerror.h"
+#include "ole.h"
 #include "ole2.h"
 #include "debug.h"
 #include "file.h"
@@ -40,21 +40,6 @@
 #include "ldt.h"
 #include "winreg.h"
 
-#define INITGUID
-
-/* FIXME: we include all the header files containing GUIDs 
- * so that the corresponding variables get defined. But they 
- * don't even all belong to the same DLL !!!
- */
-#include "objbase.h"
-#include "servprov.h"
-#include "shlobj.h"
-#include "ddraw.h"
-#include "d3d.h"
-#include "dinput.h"
-#include "dsound.h"
-#include "dplay.h"
-
 #include "objbase.h"
 
 LPMALLOC16 currentMalloc16=NULL;

ole/guid.c

+#ifndef __guid_h_
+#define __guid_h_
+
+#define INITGUID
+
+/* FIXME: we include all the header files containing GUIDs
+ * so that the corresponding variables get defined. But they
+ * don't even all belong to the same DLL !!!
+ */
+#include "oleobj.h"
+#include "objbase.h"
+#include "servprov.h"
+#include "ddraw.h"
+#include "d3d.h"
+#include "dinput.h"
+#include "dsound.h"
+#include "dplay.h"
+
+#endif