[DEVENUM]

* Remove one time inclusions from the main header and put them back where they belong.
* Improve header inclusions.
CORE-7716

svn path=/trunk/; revision=61717

reactos/dll/directx/wine/devenum/createdevenum.c

@@ -24,8 +24,11 @@
  */
 
 #include "devenum_private.h"
+
 #include <vfw.h>
 
+#include "resource.h"
+
 extern HINSTANCE DEVENUM_hInstance;
 
 const WCHAR wszInstanceKeyName[] ={'I','n','s','t','a','n','c','e',0};

reactos/dll/directx/wine/devenum/devenum.rc

@@ -18,11 +18,12 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#pragma code_page(65001)
-
 #include <windef.h>
+
 #include "resource.h"
 
+#pragma code_page(65001)
+
 LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
 
 STRINGTABLE

reactos/dll/directx/wine/devenum/devenum_main.c

@@ -20,6 +20,7 @@
  */
 
 #include "devenum_private.h"
+
 #include <rpcproxy.h>
 
 DECLSPEC_HIDDEN LONG dll_refs;

reactos/dll/directx/wine/devenum/devenum_private.h

@@ -30,6 +30,7 @@
 #define _INC_WINDOWS
 #define COM_NO_WINDOWS_H
 
+#define COBJMACROS
 #define NONAMELESSSTRUCT
 #define NONAMELESSUNION
 
@@ -37,10 +38,8 @@
 #include <winbase.h>
 #include <wingdi.h>
 #include <winreg.h>
-
-#define COBJMACROS
-
-#include <ole2.h>
+#include <objbase.h>
+#include <oleidl.h>
 #include <strmif.h>
 #include <uuids.h>
 
@@ -51,8 +50,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(devenum);
 #include <wine/unicode.h>
 #endif
 
-#include "resource.h"
-
 /**********************************************************************
  * Dll lifetime tracking declaration for devenum.dll
  */

reactos/dll/directx/wine/devenum/mediacatenum.c

@@ -23,7 +23,9 @@
  */
 
 #include "devenum_private.h"
+
 #include <ocidl.h>
+#include <oleauto.h>
 
 typedef struct
 {