diff --git a/dlls/wintab32/Makefile.in b/dlls/wintab32/Makefile.in
index 050c78b86d3..5e25e07576a 100644
--- a/dlls/wintab32/Makefile.in
+++ b/dlls/wintab32/Makefile.in
@@ -2,6 +2,8 @@ MODULE    = wintab32.dll
 IMPORTLIB = wintab32
 IMPORTS   = user32 advapi32
 
+EXTRADLLFLAGS = -mno-cygwin
+
 C_SRCS = \
 	context.c \
 	manager.c \
diff --git a/dlls/wintab32/context.c b/dlls/wintab32/context.c
index 9882a3c7c41..0514dd78b4c 100644
--- a/dlls/wintab32/context.c
+++ b/dlls/wintab32/context.c
@@ -19,7 +19,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "config.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdarg.h>
diff --git a/dlls/wintab32/manager.c b/dlls/wintab32/manager.c
index 200fd3c420e..d8d69554582 100644
--- a/dlls/wintab32/manager.c
+++ b/dlls/wintab32/manager.c
@@ -18,8 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "config.h"
-
 #include <stdarg.h>
 
 #include "windef.h"
diff --git a/dlls/wintab32/wintab32.c b/dlls/wintab32/wintab32.c
index fe535fa1af3..98ce2bc1739 100644
--- a/dlls/wintab32/wintab32.c
+++ b/dlls/wintab32/wintab32.c
@@ -29,7 +29,6 @@
 #define NOFIX32
 #include "wintab.h"
 #include "wintab_internal.h"
-#include "wine/unicode.h"
 #include "wine/debug.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(wintab32);
@@ -94,8 +93,8 @@ static HMODULE load_graphics_driver(void)
 
     if (!guid_atom) return 0;
     memcpy( key, key_pathW, sizeof(key_pathW) );
-    if (!GlobalGetAtomNameW( guid_atom, key + strlenW(key), 40 )) return 0;
-    strcatW( key, displayW );
+    if (!GlobalGetAtomNameW( guid_atom, key + lstrlenW(key), 40 )) return 0;
+    lstrcatW( key, displayW );
     if (RegOpenKeyW( HKEY_LOCAL_MACHINE, key, &hkey )) return 0;
     size = sizeof(path);
     if (!RegQueryValueExW( hkey, driverW, NULL, NULL, (BYTE *)path, &size )) ret = LoadLibraryW( path );