diff --git a/dlls/d3dx10_33/Makefile.in b/dlls/d3dx10_33/Makefile.in
index 7080752b795..e74bb229491 100644
--- a/dlls/d3dx10_33/Makefile.in
+++ b/dlls/d3dx10_33/Makefile.in
@@ -1,5 +1,7 @@
 MODULE    = d3dx10_33.dll
 
+EXTRADLLFLAGS = -mno-cygwin
+
 C_SRCS = \
 	d3dx10_33_main.c
 
diff --git a/dlls/d3dx10_33/d3dx10_33_main.c b/dlls/d3dx10_33/d3dx10_33_main.c
index 3aaf41a9091..68c52ffe33f 100644
--- a/dlls/d3dx10_33/d3dx10_33_main.c
+++ b/dlls/d3dx10_33/d3dx10_33_main.c
@@ -19,9 +19,6 @@
  *
  */
 
-#include "config.h"
-#include "wine/port.h"
-
 #include <stdarg.h>
 
 #define COBJMACROS
diff --git a/dlls/d3dx10_34/Makefile.in b/dlls/d3dx10_34/Makefile.in
index ab5ac6cd20a..2ad26f828bd 100644
--- a/dlls/d3dx10_34/Makefile.in
+++ b/dlls/d3dx10_34/Makefile.in
@@ -1,5 +1,7 @@
 MODULE    = d3dx10_34.dll
 
+EXTRADLLFLAGS = -mno-cygwin
+
 C_SRCS = \
 	d3dx10_34_main.c
 
diff --git a/dlls/d3dx10_34/d3dx10_34_main.c b/dlls/d3dx10_34/d3dx10_34_main.c
index 0c50efaf4cd..74224d5249a 100644
--- a/dlls/d3dx10_34/d3dx10_34_main.c
+++ b/dlls/d3dx10_34/d3dx10_34_main.c
@@ -19,9 +19,6 @@
  *
  */
 
-#include "config.h"
-#include "wine/port.h"
-
 #include <stdarg.h>
 
 #define COBJMACROS
diff --git a/dlls/d3dx10_35/Makefile.in b/dlls/d3dx10_35/Makefile.in
index 8a24ab5bb70..c7e52a4553b 100644
--- a/dlls/d3dx10_35/Makefile.in
+++ b/dlls/d3dx10_35/Makefile.in
@@ -1,5 +1,7 @@
 MODULE    = d3dx10_35.dll
 
+EXTRADLLFLAGS = -mno-cygwin
+
 C_SRCS = \
 	d3dx10_35_main.c
 
diff --git a/dlls/d3dx10_35/d3dx10_35_main.c b/dlls/d3dx10_35/d3dx10_35_main.c
index d92c56a75e9..9f78e2296c7 100644
--- a/dlls/d3dx10_35/d3dx10_35_main.c
+++ b/dlls/d3dx10_35/d3dx10_35_main.c
@@ -19,9 +19,6 @@
  *
  */
 
-#include "config.h"
-#include "wine/port.h"
-
 #include <stdarg.h>
 
 #define COBJMACROS
diff --git a/dlls/d3dx10_36/Makefile.in b/dlls/d3dx10_36/Makefile.in
index d6c5c31a899..b3be0edc9c8 100644
--- a/dlls/d3dx10_36/Makefile.in
+++ b/dlls/d3dx10_36/Makefile.in
@@ -1,5 +1,7 @@
 MODULE    = d3dx10_36.dll
 
+EXTRADLLFLAGS = -mno-cygwin
+
 C_SRCS = \
 	d3dx10_36_main.c
 
diff --git a/dlls/d3dx10_36/d3dx10_36_main.c b/dlls/d3dx10_36/d3dx10_36_main.c
index 06de8c3beb9..367755d53be 100644
--- a/dlls/d3dx10_36/d3dx10_36_main.c
+++ b/dlls/d3dx10_36/d3dx10_36_main.c
@@ -19,9 +19,6 @@
  *
  */
 
-#include "config.h"
-#include "wine/port.h"
-
 #include <stdarg.h>
 
 #define COBJMACROS
diff --git a/dlls/d3dx10_37/Makefile.in b/dlls/d3dx10_37/Makefile.in
index 047edeee34d..2d66b62717e 100644
--- a/dlls/d3dx10_37/Makefile.in
+++ b/dlls/d3dx10_37/Makefile.in
@@ -1,5 +1,7 @@
 MODULE    = d3dx10_37.dll
 
+EXTRADLLFLAGS = -mno-cygwin
+
 C_SRCS = \
 	d3dx10_37_main.c
 
diff --git a/dlls/d3dx10_37/d3dx10_37_main.c b/dlls/d3dx10_37/d3dx10_37_main.c
index 6b036818c73..6294d3b7370 100644
--- a/dlls/d3dx10_37/d3dx10_37_main.c
+++ b/dlls/d3dx10_37/d3dx10_37_main.c
@@ -19,9 +19,6 @@
  *
  */
 
-#include "config.h"
-#include "wine/port.h"
-
 #include <stdarg.h>
 
 #define COBJMACROS
diff --git a/dlls/d3dx10_38/Makefile.in b/dlls/d3dx10_38/Makefile.in
index 47005a60f57..7c32ea45897 100644
--- a/dlls/d3dx10_38/Makefile.in
+++ b/dlls/d3dx10_38/Makefile.in
@@ -1,5 +1,7 @@
 MODULE    = d3dx10_38.dll
 
+EXTRADLLFLAGS = -mno-cygwin
+
 C_SRCS = \
 	d3dx10_38_main.c
 
diff --git a/dlls/d3dx10_38/d3dx10_38_main.c b/dlls/d3dx10_38/d3dx10_38_main.c
index 5a5ba230e3e..984aa717704 100644
--- a/dlls/d3dx10_38/d3dx10_38_main.c
+++ b/dlls/d3dx10_38/d3dx10_38_main.c
@@ -19,9 +19,6 @@
  *
  */
 
-#include "config.h"
-#include "wine/port.h"
-
 #include <stdarg.h>
 
 #define COBJMACROS
diff --git a/dlls/d3dx10_39/Makefile.in b/dlls/d3dx10_39/Makefile.in
index cac7d287be2..8df571456fc 100644
--- a/dlls/d3dx10_39/Makefile.in
+++ b/dlls/d3dx10_39/Makefile.in
@@ -1,5 +1,7 @@
 MODULE    = d3dx10_39.dll
 
+EXTRADLLFLAGS = -mno-cygwin
+
 C_SRCS = \
 	d3dx10_39_main.c
 
diff --git a/dlls/d3dx10_39/d3dx10_39_main.c b/dlls/d3dx10_39/d3dx10_39_main.c
index 33daa9a7af7..bf577293af2 100644
--- a/dlls/d3dx10_39/d3dx10_39_main.c
+++ b/dlls/d3dx10_39/d3dx10_39_main.c
@@ -19,9 +19,6 @@
  *
  */
 
-#include "config.h"
-#include "wine/port.h"
-
 #include <stdarg.h>
 
 #define COBJMACROS
diff --git a/dlls/d3dx10_40/Makefile.in b/dlls/d3dx10_40/Makefile.in
index 7be87581ce3..760a3ac1233 100644
--- a/dlls/d3dx10_40/Makefile.in
+++ b/dlls/d3dx10_40/Makefile.in
@@ -1,5 +1,7 @@
 MODULE    = d3dx10_40.dll
 
+EXTRADLLFLAGS = -mno-cygwin
+
 C_SRCS = \
 	d3dx10_40_main.c
 
diff --git a/dlls/d3dx10_40/d3dx10_40_main.c b/dlls/d3dx10_40/d3dx10_40_main.c
index 072587148bf..3a10f4d7a16 100644
--- a/dlls/d3dx10_40/d3dx10_40_main.c
+++ b/dlls/d3dx10_40/d3dx10_40_main.c
@@ -19,9 +19,6 @@
  *
  */
 
-#include "config.h"
-#include "wine/port.h"
-
 #include <stdarg.h>
 
 #define COBJMACROS
diff --git a/dlls/d3dx10_41/Makefile.in b/dlls/d3dx10_41/Makefile.in
index 8335269995c..0199bc01a77 100644
--- a/dlls/d3dx10_41/Makefile.in
+++ b/dlls/d3dx10_41/Makefile.in
@@ -1,5 +1,7 @@
 MODULE    = d3dx10_41.dll
 
+EXTRADLLFLAGS = -mno-cygwin
+
 C_SRCS = \
 	d3dx10_41_main.c
 
diff --git a/dlls/d3dx10_41/d3dx10_41_main.c b/dlls/d3dx10_41/d3dx10_41_main.c
index e8680d836e3..0162032c57d 100644
--- a/dlls/d3dx10_41/d3dx10_41_main.c
+++ b/dlls/d3dx10_41/d3dx10_41_main.c
@@ -19,9 +19,6 @@
  *
  */
 
-#include "config.h"
-#include "wine/port.h"
-
 #include <stdarg.h>
 
 #define COBJMACROS
diff --git a/dlls/d3dx10_42/Makefile.in b/dlls/d3dx10_42/Makefile.in
index 1050d9b30a9..ffdf7505516 100644
--- a/dlls/d3dx10_42/Makefile.in
+++ b/dlls/d3dx10_42/Makefile.in
@@ -1,5 +1,7 @@
 MODULE    = d3dx10_42.dll
 
+EXTRADLLFLAGS = -mno-cygwin
+
 C_SRCS = \
 	d3dx10_42_main.c
 
diff --git a/dlls/d3dx10_42/d3dx10_42_main.c b/dlls/d3dx10_42/d3dx10_42_main.c
index 6c1167855c2..81c400eea68 100644
--- a/dlls/d3dx10_42/d3dx10_42_main.c
+++ b/dlls/d3dx10_42/d3dx10_42_main.c
@@ -19,9 +19,6 @@
  *
  */
 
-#include "config.h"
-#include "wine/port.h"
-
 #include <stdarg.h>
 
 #define COBJMACROS
diff --git a/dlls/d3dx10_43/Makefile.in b/dlls/d3dx10_43/Makefile.in
index 5f1eccbdacd..2d0343f3b08 100644
--- a/dlls/d3dx10_43/Makefile.in
+++ b/dlls/d3dx10_43/Makefile.in
@@ -2,6 +2,8 @@ MODULE    = d3dx10_43.dll
 IMPORTLIB = d3dx10
 IMPORTS   = d3d10_1 d3dcompiler dxguid
 
+EXTRADLLFLAGS = -mno-cygwin
+
 C_SRCS = \
 	async.c \
 	d3dx10_43_main.c
diff --git a/dlls/d3dx10_43/async.c b/dlls/d3dx10_43/async.c
index c7d80c9db46..062a04d739c 100644
--- a/dlls/d3dx10_43/async.c
+++ b/dlls/d3dx10_43/async.c
@@ -16,14 +16,11 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "config.h"
-#include "wine/port.h"
 #include "d3d10_1.h"
 #include "d3dx10.h"
 #include "d3dcompiler.h"
 
 #include "wine/debug.h"
-#include "wine/unicode.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(d3dx);
 
@@ -318,13 +315,13 @@ HRESULT WINAPI D3DX10CreateAsyncFileLoaderW(const WCHAR *filename, ID3DX10DataLo
         return E_OUTOFMEMORY;
 
     object->ID3DX10DataLoader_iface.lpVtbl = &filedataloadervtbl;
-    object->u.file.path = HeapAlloc(GetProcessHeap(), 0, (strlenW(filename) + 1) * sizeof(WCHAR));
+    object->u.file.path = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(filename) + 1) * sizeof(WCHAR));
     if (!object->u.file.path)
     {
         HeapFree(GetProcessHeap(), 0, object);
         return E_OUTOFMEMORY;
     }
-    strcpyW(object->u.file.path, filename);
+    lstrcpyW(object->u.file.path, filename);
     object->data = NULL;
     object->size = 0;
 
diff --git a/dlls/d3dx10_43/d3dx10_43_main.c b/dlls/d3dx10_43/d3dx10_43_main.c
index 0edb3a948b3..b0295cc093f 100644
--- a/dlls/d3dx10_43/d3dx10_43_main.c
+++ b/dlls/d3dx10_43/d3dx10_43_main.c
@@ -19,10 +19,7 @@
  *
  */
 
-#include "config.h"
-#include "wine/port.h"
 #include "wine/debug.h"
-#include "wine/unicode.h"
 
 #include <stdarg.h>