[D3DCOMPILER_43]

* Move some inclusions to the main header.
* Remove inclusions that already exist in the main header.
CORE-7716

svn path=/trunk/; revision=61324

diff --git a/reactos/dll/directx/wine/d3dcompiler_43/asmparser.c b/reactos/dll/directx/wine/d3dcompiler_43/asmparser.c
index c57343f..12d5fc3 100644 (file)
--- a/reactos/dll/directx/wine/d3dcompiler_43/asmparser.c
+++ b/reactos/dll/directx/wine/d3dcompiler_43/asmparser.c
@@ -20,10 +20,6 @@
  *
  */
 
-#include "config.h"
-#include "wine/port.h"
-#include "wine/debug.h"
-
 #include "d3dcompiler_private.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(asmshader);

diff --git a/reactos/dll/directx/wine/d3dcompiler_43/asmshader.tab.c b/reactos/dll/directx/wine/d3dcompiler_43/asmshader.tab.c
index e5e0d3e..c8d80d3 100644 (file)
--- a/reactos/dll/directx/wine/d3dcompiler_43/asmshader.tab.c
+++ b/reactos/dll/directx/wine/d3dcompiler_43/asmshader.tab.c
@@ -76,10 +76,6 @@
 /* Line 268 of yacc.c  */
 #line 22 "asmshader.y"
 
-#include "config.h"
-#include "wine/port.h"
-#include "wine/debug.h"
-
 #include "d3dcompiler_private.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(asmshader);

diff --git a/reactos/dll/directx/wine/d3dcompiler_43/blob.c b/reactos/dll/directx/wine/d3dcompiler_43/blob.c
index 865d139..c04891a 100644 (file)
--- a/reactos/dll/directx/wine/d3dcompiler_43/blob.c
+++ b/reactos/dll/directx/wine/d3dcompiler_43/blob.c
@@ -19,9 +19,6 @@
  *
  */
 
-#include "config.h"
-#include "wine/port.h"
-
 #include "d3dcompiler_private.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(d3dcompiler);

diff --git a/reactos/dll/directx/wine/d3dcompiler_43/bytecodewriter.c b/reactos/dll/directx/wine/d3dcompiler_43/bytecodewriter.c
index 17289d2..f94cb52 100644 (file)
--- a/reactos/dll/directx/wine/d3dcompiler_43/bytecodewriter.c
+++ b/reactos/dll/directx/wine/d3dcompiler_43/bytecodewriter.c
@@ -20,12 +20,8 @@
  *
  */
 
-#include "config.h"
-#include "wine/port.h"
-#include "wine/debug.h"
-
-#include "d3d9types.h"
 #include "d3dcompiler_private.h"
+#include "d3d9types.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(bytecodewriter);
 

diff --git a/reactos/dll/directx/wine/d3dcompiler_43/compiler.c b/reactos/dll/directx/wine/d3dcompiler_43/compiler.c
index 14fa652..c5f3bfe 100644 (file)
--- a/reactos/dll/directx/wine/d3dcompiler_43/compiler.c
+++ b/reactos/dll/directx/wine/d3dcompiler_43/compiler.c
@@ -17,13 +17,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define COBJMACROS
-#include "config.h"
-#include "wine/port.h"
-#include "wine/debug.h"
-#include "wine/unicode.h"
-
 #include "d3dcompiler_private.h"
+#include "wine/unicode.h"
 #include "wine/wpp.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(d3dcompiler);

diff --git a/reactos/dll/directx/wine/d3dcompiler_43/d3dcompiler_43_main.c b/reactos/dll/directx/wine/d3dcompiler_43/d3dcompiler_43_main.c
index 0c66471..983031d 100644 (file)
--- a/reactos/dll/directx/wine/d3dcompiler_43/d3dcompiler_43_main.c
+++ b/reactos/dll/directx/wine/d3dcompiler_43/d3dcompiler_43_main.c
@@ -19,13 +19,6 @@
  *
  */
 
-#include "config.h"
-
-#include <stdarg.h>
-
-#include "windef.h"
-#include "winbase.h"
-
 #include "d3dcompiler_private.h"
 
 BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, LPVOID reserved)

diff --git a/reactos/dll/directx/wine/d3dcompiler_43/d3dcompiler_private.h b/reactos/dll/directx/wine/d3dcompiler_43/d3dcompiler_private.h
index d25b4e5..4573762 100644 (file)
--- a/reactos/dll/directx/wine/d3dcompiler_43/d3dcompiler_private.h
+++ b/reactos/dll/directx/wine/d3dcompiler_43/d3dcompiler_private.h
@@ -22,16 +22,21 @@
 #ifndef __WINE_D3DCOMPILER_PRIVATE_H
 #define __WINE_D3DCOMPILER_PRIVATE_H
 
-#include "wine/debug.h"
-#include "wine/list.h"
-#include "wine/rbtree.h"
+#include <config.h>
+#include <wine/port.h>
+
+#include <stdio.h>
+
+#include <wine/debug.h>
+#include <wine/list.h>
+#include <wine/rbtree.h>
 
 #define COBJMACROS
-#include "windef.h"
-#include "winbase.h"
-#include "objbase.h"
+#include <windef.h>
+#include <winbase.h>
+#include <objbase.h>
 
-#include "d3dcompiler.h"
+#include <d3dcompiler.h>
 
 #include <assert.h>
 

diff --git a/reactos/dll/directx/wine/d3dcompiler_43/hlsl.tab.c b/reactos/dll/directx/wine/d3dcompiler_43/hlsl.tab.c
index 5f64755..58bccd2 100644 (file)
--- a/reactos/dll/directx/wine/d3dcompiler_43/hlsl.tab.c
+++ b/reactos/dll/directx/wine/d3dcompiler_43/hlsl.tab.c
@@ -76,11 +76,6 @@
 /* Line 268 of yacc.c  */
 #line 21 "hlsl.y"
 
-#include "config.h"
-#include "wine/debug.h"
-
-#include <stdio.h>
-
 #include "d3dcompiler_private.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(hlsl_parser);

diff --git a/reactos/dll/directx/wine/d3dcompiler_43/reflection.c b/reactos/dll/directx/wine/d3dcompiler_43/reflection.c
index f516e4a..8cc1fe4 100644 (file)
--- a/reactos/dll/directx/wine/d3dcompiler_43/reflection.c
+++ b/reactos/dll/directx/wine/d3dcompiler_43/reflection.c
@@ -18,9 +18,6 @@
  *
  */
 
-#include "config.h"
-#include "wine/port.h"
-
 #include "d3dcompiler_private.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(d3dcompiler);

diff --git a/reactos/dll/directx/wine/d3dcompiler_43/utils.c b/reactos/dll/directx/wine/d3dcompiler_43/utils.c
index 0f61f61..001ba8e 100644 (file)
--- a/reactos/dll/directx/wine/d3dcompiler_43/utils.c
+++ b/reactos/dll/directx/wine/d3dcompiler_43/utils.c
@@ -21,11 +21,6 @@
  *
  */
 
-#include "config.h"
-#include "wine/port.h"
-
-#include <stdio.h>
-
 #include "d3dcompiler_private.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(d3dcompiler);