diff --git a/reactos/include/reactos/wine/config.h b/reactos/include/reactos/wine/config.h
index ce8ab1cb148..f24e05a0a0e 100644
--- a/reactos/include/reactos/wine/config.h
+++ b/reactos/include/reactos/wine/config.h
@@ -99,37 +99,43 @@
 #define HAVE_FPCLASS 1
 
 /* Define if FreeType 2 is installed */
-/* #undef HAVE_FREETYPE */
+#define HAVE_FREETYPE 1
 
 /* Define to 1 if you have the <freetype/freetype.h> header file. */
-/* #undef HAVE_FREETYPE_FREETYPE_H */
+#define HAVE_FREETYPE_FREETYPE_H 1
 
 /* Define to 1 if you have the <freetype/ftglyph.h> header file. */
-/* #undef HAVE_FREETYPE_FTGLYPH_H */
+#define HAVE_FREETYPE_FTGLYPH_H 1
+
+/* Define to 1 if you have the <freetype/ftlcdfil.h> header file. */
+#define HAVE_FREETYPE_FTLCDFIL_H 1
+
+/* Define to 1 if you have the <freetype/ftmodapi.h> header file. */
+#define HAVE_FREETYPE_FTMODAPI_H 1
 
 /* Define to 1 if you have the <freetype/ftnames.h> header file. */
 /* #undef HAVE_FREETYPE_FTNAMES_H */
 
 /* Define to 1 if you have the <freetype/ftoutln.h> header file. */
-/* #undef HAVE_FREETYPE_FTOUTLN_H */
+#define HAVE_FREETYPE_FTOUTLN_H 1
 
 /* Define to 1 if you have the <freetype/ftsnames.h> header file. */
-/* #undef HAVE_FREETYPE_FTSNAMES_H */
+#define HAVE_FREETYPE_FTSNAMES_H 1
 
 /* Define if you have the <freetype/fttrigon.h> header file. */
-/* #undef HAVE_FREETYPE_FTTRIGON_H */
+#define HAVE_FREETYPE_FTTRIGON_H 1
 
 /* Define to 1 if you have the <freetype/ftwinfnt.h> header file. */
-/* #undef HAVE_FREETYPE_FTWINFNT_H */
+#define HAVE_FREETYPE_FTWINFNT_H 1
 
 /* Define to 1 if you have the <freetype/internal/sfnt.h> header file. */
 /* #undef HAVE_FREETYPE_INTERNAL_SFNT_H */
 
 /* Define to 1 if you have the <freetype/ttnameid.h> header file. */
-/* #undef HAVE_FREETYPE_TTNAMEID_H */
+#define HAVE_FREETYPE_TTNAMEID_H 1
 
 /* Define to 1 if you have the <freetype/tttables.h> header file. */
-/* #undef HAVE_FREETYPE_TTTABLES_H */
+#define HAVE_FREETYPE_TTTABLES_H 1
 
 /* Define to 1 if the system has the type `fsblkcnt_t'. */
 /* #undef HAVE_FSBLKCNT_T */
@@ -144,7 +150,13 @@
 /* #undef HAVE_FSTATVFS */
 
 /* Define to 1 if you have the <ft2build.h> header file. */
-/* #undef HAVE_FT2BUILD_H */
+#define HAVE_FT2BUILD_H 1
+
+/* Define to 1 if you have the `FT_Load_Sfnt_Table' function. */
+/* #undef HAVE_FT_LOAD_SFNT_TABLE */
+
+/* Define to 1 if the system has the type `FT_TrueTypeEngineType'. */
+#define HAVE_FT_TRUETYPEENGINETYPE 1
 
 /* Define to 1 if you have the `ftruncate' function. */
 #define HAVE_FTRUNCATE 1
diff --git a/reactos/include/reactos/wine/test.h b/reactos/include/reactos/wine/test.h
index 8c07c7d84d8..fdf3c886ec5 100644
--- a/reactos/include/reactos/wine/test.h
+++ b/reactos/include/reactos/wine/test.h
@@ -237,8 +237,7 @@ static tls_data* get_tls_data(void)
     data=TlsGetValue(tls_index);
     if (!data)
     {
-        data=HeapAlloc(GetProcessHeap(), 0, sizeof(tls_data));
-        data->todo_level = 0;
+        data=HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(tls_data));
         data->str_pos = data->strings;
         TlsSetValue(tls_index,data);
     }
@@ -593,6 +592,8 @@ int main( int argc, char **argv )
     if (GetEnvironmentVariableA( "WINETEST_INTERACTIVE", p, sizeof(p) )) winetest_interactive = atoi(p);
     if (GetEnvironmentVariableA( "WINETEST_REPORT_SUCCESS", p, sizeof(p) )) report_success = atoi(p);
 
+    if (!winetest_interactive) SetErrorMode( SEM_FAILCRITICALERRORS | SEM_NOGPFAULTERRORBOX );
+
     if (!argv[1])
     {
         if (winetest_testlist[0].name && !winetest_testlist[1].name)  /* only one test */
diff --git a/reactos/include/reactos/wine/windef16.h b/reactos/include/reactos/wine/windef16.h
index 002eeaa7e5d..07f13fc5463 100644
--- a/reactos/include/reactos/wine/windef16.h
+++ b/reactos/include/reactos/wine/windef16.h
@@ -28,7 +28,9 @@
 #endif
 #include <windef.h>
 #include <winbase.h>
-#include <wine/exception.h>
+#ifndef _NTNDK_
+#include <exception.h> // ROS Hack
+#endif
 /* Standard data types */
 
 typedef unsigned short  BOOL16;
diff --git a/reactos/include/reactos/wine/wingdi16.h b/reactos/include/reactos/wine/wingdi16.h
index abd6ccd41fe..95b1e286ad5 100644
--- a/reactos/include/reactos/wine/wingdi16.h
+++ b/reactos/include/reactos/wine/wingdi16.h
@@ -27,6 +27,24 @@
 
 #include <pshpack1.h>
 
+typedef struct
+{
+    INT16  lfHeight;
+    INT16  lfWidth;
+    INT16  lfEscapement;
+    INT16  lfOrientation;
+    INT16  lfWeight;
+    BYTE   lfItalic;
+    BYTE   lfUnderline;
+    BYTE   lfStrikeOut;
+    BYTE   lfCharSet;
+    BYTE   lfOutPrecision;
+    BYTE   lfClipPrecision;
+    BYTE   lfQuality;
+    BYTE   lfPitchAndFamily;
+    CHAR   lfFaceName[LF_FACESIZE];
+} LOGFONT16, *LPLOGFONT16;
+
 typedef struct
 {
     INT16        mm;
diff --git a/reactos/include/reactos/wine/winuser16.h b/reactos/include/reactos/wine/winuser16.h
deleted file mode 100644
index f53676883d0..00000000000
--- a/reactos/include/reactos/wine/winuser16.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (C) the Wine project
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-#ifndef __WINE_WINE_WINUSER16_H
-#define __WINE_WINE_WINUSER16_H
-
-#ifndef CB_SETITEMDATA16
-#define CB_SETITEMDATA16           (WM_USER+17)
-#endif
-
-#endif /* __WINE_WINE_WINUSER16_H */