uuid: Remove a few iids that don't belong here.

dlls/avifil32/factory.c

@@ -25,17 +25,16 @@
 #include "wingdi.h"
 #include "winuser.h"
 #include "winerror.h"
-
 #include "ole2.h"
+
+#include "initguid.h"
 #include "vfw.h"
+#include "avifile_private.h"
 
 #include "wine/debug.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(avifile);
 
-#include "initguid.h"
-#include "avifile_private.h"
-
 HMODULE AVIFILE_hModule   = NULL;
 
 static BOOL    AVIFILE_bLocked;

dlls/dplayx/dpclassfactory.c

@@ -24,9 +24,13 @@
 
 #include "windef.h"
 #include "winbase.h"
+#include "winuser.h"
 #include "objbase.h"
 #include "winerror.h"
 #include "wine/debug.h"
+#include "dplay.h"
+#include "dplobby.h"
+#include "initguid.h"
 #include "dpinit.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(dplay);

dlls/mapi32/mapi32_main.c

@@ -24,6 +24,7 @@
 #include "winbase.h"
 #include "winerror.h"
 #include "objbase.h"
+#include "initguid.h"
 #include "mapix.h"
 #include "mapiform.h"
 #include "mapi.h"

dlls/mapi32/tests/prop.c

@@ -24,6 +24,7 @@
 #include "winuser.h"
 #include "winerror.h"
 #include "winnt.h"
+#include "initguid.h"
 #include "mapiutil.h"
 #include "mapitags.h"
 

dlls/uuid/uuid.c

@@ -50,7 +50,6 @@ DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0);
 #include "shldisp.h"
 #include "comcat.h"
 #include "urlmon.h"
-#include "mapiguid.h"
 #include "activscp.h"
 #include "dispex.h"
 #include "mlang.h"
@@ -72,14 +71,8 @@ DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0);
 
 /* FIXME: cguids declares GUIDs but does not define their values */
 
-/* other GUIDs */
-
-#include "vfw.h"
-
 /* GUIDs not declared in an exported header file */
-DEFINE_GUID(IID_IDirectPlaySP,            0x0c9f6360,0xcc61,0x11cf,0xac,0xec,0x00,0xaa,0x00,0x68,0x86,0xe3);
 DEFINE_GUID(IID_ISFHelper,                0x1fe68efb,0x1874,0x9812,0x56,0xdc,0x00,0x00,0x00,0x00,0x00,0x00);
-DEFINE_GUID(IID_IDPLobbySP,               0x5a4e5a20,0x2ced,0x11d0,0xa8,0x89,0x00,0xa0,0xc9,0x05,0x43,0x3c);
 DEFINE_GUID(IID_IProxyManager,            0x00000008,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46);
 DEFINE_GUID(IID_IBindStatusCallbackHolder,0x79eac9cc,0xbaf9,0x11ce,0x8c,0x82,0x00,0xaa,0x00,0x4b,0xa9,0x0b);