diff --git a/reactos/include/funcs.h b/reactos/include/funcs.h
index 2128459ca40..71915121f69 100644
--- a/reactos/include/funcs.h
+++ b/reactos/include/funcs.h
@@ -4088,7 +4088,7 @@ DWORD
 STDCALL
 GdiGetCharDimensions(HDC hdc,LPTEXTMETRICW lptm,BOOL unk);
 
-PSHAREDHANDLETABLE
+PVOID
 STDCALL
 GdiQueryTable(VOID);
 
diff --git a/reactos/include/win32k/ntuser.h b/reactos/include/win32k/ntuser.h
index dff98382f37..479de5d7bd7 100644
--- a/reactos/include/win32k/ntuser.h
+++ b/reactos/include/win32k/ntuser.h
@@ -163,6 +163,7 @@ NtUserCallNextHookEx(
 #define NOPARAM_ROUTINE_GETMESSAGEEXTRAINFO	0xffff0005
 #define NOPARAM_ROUTINE_ANYPOPUP	0xffff0006
 #define NOPARAM_ROUTINE_CSRSS_INITIALIZED	0xffff0007
+#define NOPARAM_ROUTINE_GDI_QUERY_TABLE	0xffff0008
 DWORD
 STDCALL
 NtUserCallNoParam(
@@ -1765,6 +1766,18 @@ typedef struct tagKMDDELPARAM
     } Value;
 } KMDDELPARAM, *PKMDDELPARAM;
 
+#include <pshpack1.h>
+typedef struct _GDI_TABLE_ENTRY
+{
+  PVOID KernelData;         /* Points to the kernel mode structure */
+  unsigned short ProcessId; /* process id that created the object, 0 for stock objects */
+  unsigned short Count;     /* we don't use this field, only NT4 uses it */
+  unsigned short Upper;     /* copy of the upper 16 bit of the handle, contains the object type */
+  unsigned short nType;     /* object type */
+  PVOID UserData;           /* Points to the user mode structure, usually NULL though */
+} GDI_TABLE_ENTRY, *PGDI_TABLE_ENTRY;
+#include <poppack.h>
+
 #endif /* __WIN32K_NTUSER_H */
 
 /* EOF */
diff --git a/reactos/lib/gdi32/include/internal/font.h b/reactos/lib/gdi32/include/internal/font.h
deleted file mode 100644
index 16cc5ad586d..00000000000
--- a/reactos/lib/gdi32/include/internal/font.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* $Id: font.h,v 1.2 2004/08/15 18:40:07 chorns Exp $
- *
- * COPYRIGHT:       See COPYING in the top level directory
- * PROJECT:         ReactOS system libraries
- * FILE:            lib/gdi32/include/internal/font.h
- * PURPOSE:         
- * PROGRAMMER:
- *
- */
-
-#ifndef GDI32_FONT_H_INCLUDED
-#define GDI32_FONT_H_INCLUDED
-
-BOOL FASTCALL TextMetricW2A(TEXTMETRICA *tma, TEXTMETRICW *tmw);
-BOOL FASTCALL NewTextMetricW2A(NEWTEXTMETRICA *tma, NEWTEXTMETRICW *tmw);
-BOOL FASTCALL NewTextMetricExW2A(NEWTEXTMETRICEXA *tma, NEWTEXTMETRICEXW *tmw);
-
-#endif
-
diff --git a/reactos/lib/gdi32/include/internal/heap.h b/reactos/lib/gdi32/include/internal/heap.h
deleted file mode 100644
index f3e841c8526..00000000000
--- a/reactos/lib/gdi32/include/internal/heap.h
+++ /dev/null
@@ -1,17 +0,0 @@
-// heap.h
-
-#ifndef GDI32_INTERNAL_HEAP_H
-#define GDI32_INTERNAL_HEAP_H
-
-extern HANDLE hProcessHeap;
-
-PVOID
-HEAP_alloc ( DWORD len );
-
-NTSTATUS
-HEAP_strdupA2W ( LPWSTR* ppszW, LPCSTR lpszA );
-
-VOID
-HEAP_free ( LPVOID memory );
-
-#endif//GDI32_INTERNAL_HEAP_H
diff --git a/reactos/lib/gdi32/include/precomp.h b/reactos/lib/gdi32/include/precomp.h
index d65edc66586..1d95489956c 100644
--- a/reactos/lib/gdi32/include/precomp.h
+++ b/reactos/lib/gdi32/include/precomp.h
@@ -1,3 +1,55 @@
 #include <windows.h>
+#include <ddentry.h>
+#include <string.h>
+#include <win32k/kapi.h>
+#include <ddk/prntfont.h>
+#include <rosrtl/logfont.h>
+#include <rosrtl/devmode.h>
+#include <wine/unicode.h>
 #define NTOS_MODE_USER
 #include <ntos.h>
+
+#define NtGdiQueryTable() \
+  (PGDI_TABLE_ENTRY)NtUserCallNoParam(NOPARAM_ROUTINE_GDI_QUERY_TABLE)
+
+#define NtUserGetDCBrushColor(hbr) \
+  (COLORREF)NtUserCallTwoParam((DWORD)(hbr), OBJ_BRUSH, TWOPARAM_ROUTINE_GETDCCOLOR)
+
+#define NtUserGetDCPenColor(hbr) \
+  (COLORREF)NtUserCallTwoParam((DWORD)(hbr), OBJ_PEN, TWOPARAM_ROUTINE_GETDCCOLOR)
+
+#define NtUserSetDCBrushColor(hbr, crColor) \
+  (COLORREF)NtUserCallTwoParam((DWORD)(hbr), (DWORD)crColor, TWOPARAM_ROUTINE_SETDCBRUSHCOLOR)
+
+#define NtUserSetDCPenColor(hbr, crColor) \
+  (COLORREF)NtUserCallTwoParam((DWORD)(hbr), (DWORD)crColor, TWOPARAM_ROUTINE_SETDCPENCOLOR)
+
+#ifdef __USE_W32API
+typedef int (CALLBACK* EMFPLAYPROC)( HDC, INT, HANDLE );
+typedef DWORD FULLSCREENCONTROL;
+typedef DWORD UNIVERSAL_FONT_ID;
+typedef UNIVERSAL_FONT_ID *PUNIVERSAL_FONT_ID;
+typedef DWORD REALIZATION_INFO;
+typedef REALIZATION_INFO *PREALIZATION_INFO;
+typedef DWORD CHWIDTHINFO;
+typedef CHWIDTHINFO *PCHWIDTHINFO;
+#endif
+
+/* == GLOBAL VARIABLES ====================================================== */
+
+extern PGDI_TABLE_ENTRY GdiHandleTable;
+extern HANDLE hProcessHeap;
+
+/* == HEAP ================================================================== */
+
+PVOID    HEAP_alloc ( DWORD len );
+NTSTATUS HEAP_strdupA2W ( LPWSTR* ppszW, LPCSTR lpszA );
+VOID     HEAP_free ( LPVOID memory );
+
+/* == FONT ================================================================== */
+
+BOOL FASTCALL TextMetricW2A(TEXTMETRICA *tma, TEXTMETRICW *tmw);
+BOOL FASTCALL NewTextMetricW2A(NEWTEXTMETRICA *tma, NEWTEXTMETRICW *tmw);
+BOOL FASTCALL NewTextMetricExW2A(NEWTEXTMETRICEXA *tma, NEWTEXTMETRICEXW *tmw);
+
+/* EOF */
diff --git a/reactos/lib/gdi32/main/dllmain.c b/reactos/lib/gdi32/main/dllmain.c
index 6018f853232..df124d9f078 100644
--- a/reactos/lib/gdi32/main/dllmain.c
+++ b/reactos/lib/gdi32/main/dllmain.c
@@ -1,15 +1,13 @@
 /*
  * dllmain.c
  *
- * $Revision: 1.10 $
- * $Author: chorns $
- * $Date: 2004/08/15 18:40:07 $
+ * $Revision: 1.11 $
+ * $Author: weiden $
+ * $Date: 2004/09/06 21:15:45 $
  *
  */
 
 #include "precomp.h"
-#include <win32k/win32k.h>
-#include <internal/heap.h>
 
 /*
  * GDI32.DLL doesn't have an entry point. The initialization is done by a call
@@ -32,6 +30,9 @@ WINAPI
 GdiProcessSetup (VOID)
 {
 	hProcessHeap = GetProcessHeap();
+
+        /* map the gdi handle table to user space */
+	GdiHandleTable = NtGdiQueryTable();
 }
 
 
diff --git a/reactos/lib/gdi32/makefile b/reactos/lib/gdi32/makefile
index 77d472c5207..9307c4855b7 100644
--- a/reactos/lib/gdi32/makefile
+++ b/reactos/lib/gdi32/makefile
@@ -1,4 +1,4 @@
-# $Id: makefile,v 1.39 2004/08/15 18:40:07 chorns Exp $
+# $Id: makefile,v 1.40 2004/09/06 21:15:45 weiden Exp $
 
 PATH_TO_TOP = ../..
 
@@ -31,6 +31,7 @@ MAIN_OBJECTS = main/dllmain.o
 
 MISC_OBJECTS = \
  misc/heap.o \
+ misc/misc.o \
  misc/stubs.o \
  misc/stubsa.o \
  misc/stubsw.o \
diff --git a/reactos/lib/gdi32/misc/heap.c b/reactos/lib/gdi32/misc/heap.c
index 9097f587f63..019f7beb2bc 100644
--- a/reactos/lib/gdi32/misc/heap.c
+++ b/reactos/lib/gdi32/misc/heap.c
@@ -4,6 +4,7 @@
 // global variables in a dll are process-global
 HANDLE hProcessHeap = NULL;
 
+
 PVOID
 HEAP_alloc ( DWORD len )
 {
diff --git a/reactos/lib/gdi32/misc/misc.c b/reactos/lib/gdi32/misc/misc.c
new file mode 100644
index 00000000000..d44a23b356c
--- /dev/null
+++ b/reactos/lib/gdi32/misc/misc.c
@@ -0,0 +1,41 @@
+/*
+ *  ReactOS GDI lib
+ *  Copyright (C) 2003 ReactOS Team
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program 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 General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+/* $Id: misc.c,v 1.1 2004/09/06 21:15:45 weiden Exp $
+ *
+ * PROJECT:         ReactOS gdi32.dll
+ * FILE:            lib/gdi32/misc/misc.c
+ * PURPOSE:         Miscellaneous functions
+ * PROGRAMMER:      Thomas Weidenmueller <w3seek@reactos.com>
+ * UPDATE HISTORY:
+ *      2004/09/04  Created
+ */
+
+#include "precomp.h"
+
+PGDI_TABLE_ENTRY GdiHandleTable = NULL;
+
+/*
+ * @implemented
+ */
+PVOID
+STDCALL
+GdiQueryTable(VOID)
+{
+  return (PVOID)GdiHandleTable;
+}
diff --git a/reactos/lib/gdi32/misc/stubs.c b/reactos/lib/gdi32/misc/stubs.c
index adbef8fed07..6765079345c 100644
--- a/reactos/lib/gdi32/misc/stubs.c
+++ b/reactos/lib/gdi32/misc/stubs.c
@@ -1,4 +1,4 @@
-/* $Id: stubs.c,v 1.64 2004/08/15 18:40:07 chorns Exp $
+/* $Id: stubs.c,v 1.65 2004/09/06 21:15:45 weiden Exp $
  *
  * reactos/lib/gdi32/misc/stubs.c
  *
@@ -9,26 +9,7 @@
  *
  */
 
-/* Can't use precomp.h because of this */
-#ifdef UNICODE
-#undef UNICODE
-#endif
-#include <windows.h>
-#include <ddentry.h>
-#include <ddk/prntfont.h>
-
-#ifdef __USE_W32API
-typedef int (CALLBACK* EMFPLAYPROC)( HDC, INT, HANDLE );
-typedef DWORD FULLSCREENCONTROL;
-typedef DWORD SHAREDHANDLETABLE;
-typedef SHAREDHANDLETABLE *PSHAREDHANDLETABLE;
-typedef DWORD UNIVERSAL_FONT_ID;
-typedef UNIVERSAL_FONT_ID *PUNIVERSAL_FONT_ID;
-typedef DWORD REALIZATION_INFO;
-typedef REALIZATION_INFO *PREALIZATION_INFO;
-typedef DWORD CHWIDTHINFO;
-typedef CHWIDTHINFO *PCHWIDTHINFO;
-#endif
+#include "precomp.h"
 
 #define UNIMPLEMENTED DbgPrint("GDI32: %s is unimplemented, please try again later.\n", __FUNCTION__);
 
@@ -1907,30 +1888,6 @@ EndFormPage(HDC hdc)
 	return 0;
 }
 
-/*
- * @unimplemented
- */
-BOOL
-STDCALL
-EudcLoadLinkW(LPCWSTR pBaseFaceName,LPCWSTR pEudcFontPath,INT iPriority,INT iFontLinkType)
-{
-	UNIMPLEMENTED;
-	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
-	return 0;
-}
-
-/*
- * @unimplemented
- */
-BOOL 
-STDCALL
-EudcUnloadLinkW(LPCWSTR pBaseFaceName,LPCWSTR pEudcFontPath)
-{
-	UNIMPLEMENTED;
-	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
-	return 0;
-}
-
 /*
  * @unimplemented
  */
@@ -1943,18 +1900,6 @@ FontIsLinked(HDC hdc)
 	return 0;
 }
 
-/*
- * @unimplemented
- */
-int 
-STDCALL
-GdiAddFontResourceW(LPCWSTR filename,FLONG f,DESIGNVECTOR *pdv)
-{
-	UNIMPLEMENTED;
-	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
-	return 0;
-}
-
 /*
  * @unimplemented
  */
@@ -2003,18 +1948,6 @@ GdiCleanCacheDC(HDC hdc)
 	return 0;
 }
 
-/*
- * @unimplemented
- */
-BOOL 
-STDCALL
-GdiConsoleTextOut(HDC hdc, POLYTEXTW *lpto,UINT nStrings, RECTL *prclBounds)
-{
-	UNIMPLEMENTED;
-	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
-	return 0;
-}
-
 /*
  * @unimplemented
  */
@@ -2424,18 +2357,6 @@ GetEUDCTimeStamp(VOID)
 	return 0;
 }
 
-/*
- * @unimplemented
- */
-DWORD 
-STDCALL
-GetEUDCTimeStampExW(LPCWSTR str)
-{
-	UNIMPLEMENTED;
-	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
-	return 0;
-}
-
 /*
  * @unimplemented
  */
@@ -2584,38 +2505,6 @@ RemoveFontMemResourceEx(
 	return 0;
 }
 
-/*
- * @unimplemented
- */
-BOOL 
-STDCALL
-RemoveFontResourceExA(
-	LPCSTR lpFileName,
-	DWORD fl,
-	PVOID pdv
-)
-{
-	UNIMPLEMENTED;
-	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
-	return 0;
-}
-
-/*
- * @unimplemented
- */
-BOOL 
-STDCALL
-RemoveFontResourceExW(
-	LPCWSTR lpFileName,
-	DWORD fl,
-	PVOID pdv
-)
-{
-	UNIMPLEMENTED;
-	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
-	return 0;
-}
-
 /*
  * @unimplemented
  */
@@ -2726,72 +2615,6 @@ UnloadNetworkFonts(DWORD unknown)
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 }
 
-/*
- * @unimplemented
- */
-BOOL 
-STDCALL
-bInitSystemAndFontsDirectoriesW(LPWSTR *SystemDir,LPWSTR *FontsDir)
-{
-	UNIMPLEMENTED;
-	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
-	return 0;
-}
-
-/*
- * @unimplemented
- */
-BOOL 
-STDCALL
-bMakePathNameW(LPWSTR lpBuffer,LPCWSTR lpFileName,LPWSTR *lpFilePart,DWORD unknown)
-{
-	UNIMPLEMENTED;
-	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
-	return 0;
-}
-
-/*
- * @unimplemented
- */
-HFONT 
-STDCALL
-CreateFontIndirectExA(const ENUMLOGFONTEXDVA *elfexd)
-{
-	UNIMPLEMENTED;
-	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
-	return 0;
-}
-
-/*
- * @unimplemented
- */
-DWORD 
-STDCALL
-GetGlyphIndicesA(
-	HDC hdc,
-	LPCSTR lpstr,
-	int c,
-	LPWORD pgi,
-	DWORD fl
-)
-{
-	UNIMPLEMENTED;
-	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
-	return 0;
-}
-
-/*
- * @unimplemented
- */
-UINT 
-STDCALL
-GetStringBitmapA(HDC hdc,LPSTR psz,BOOL unknown,UINT cj,BYTE *lpSB)
-{
-	UNIMPLEMENTED;
-	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
-	return 0;
-}
-
 /*
  * @unimplemented
  */
@@ -2812,48 +2635,6 @@ GetTextExtentExPointI(
 	return 0;
 }
 
-/*
- * @unimplemented
- */
-HFONT
-STDCALL
-CreateFontIndirectExW(const ENUMLOGFONTEXDVW *elfexd)
-{
-	UNIMPLEMENTED;
-	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
-	return 0;
-}
-
-/*
- * @unimplemented
- */
-DWORD 
-STDCALL
-GetGlyphIndicesW(
-	HDC hdc,
-	LPCWSTR lpstr,
-	int c,
-	LPWORD pgi,
-	DWORD fl
-)
-{
-	UNIMPLEMENTED;
-	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
-	return 0;
-}
-
-/*
- * @unimplemented
- */
-UINT 
-STDCALL
-GetStringBitmapW(HDC hdc,LPWSTR pwsz,BOOL unknown,UINT cj,BYTE *lpSB)
-{
-	UNIMPLEMENTED;
-	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
-	return 0;
-}
-
 /*
  * @unimplemented
  */
@@ -3005,18 +2786,6 @@ GdiGetCharDimensions(HDC hdc,LPTEXTMETRICW lptm,BOOL unk)
 	return 0;
 }
 
-/*
- * @unimplemented
- */
-PSHAREDHANDLETABLE
-STDCALL
-GdiQueryTable(VOID)
-{
-	UNIMPLEMENTED;
-	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
-	return 0;
-}
-
 /*
  * @unimplemented
  */
diff --git a/reactos/lib/gdi32/misc/stubsa.c b/reactos/lib/gdi32/misc/stubsa.c
index 9c218919a48..608bd1dfb66 100644
--- a/reactos/lib/gdi32/misc/stubsa.c
+++ b/reactos/lib/gdi32/misc/stubsa.c
@@ -1,4 +1,4 @@
-/* $Id: stubsa.c,v 1.33 2004/08/15 18:40:07 chorns Exp $
+/* $Id: stubsa.c,v 1.34 2004/09/06 21:15:45 weiden Exp $
  *
  * reactos/lib/gdi32/misc/stubs.c
  *
@@ -9,21 +9,7 @@
  *
  */
 
-/* Can't use precomp.h because of this */
-#ifdef UNICODE
-#undef UNICODE
-#endif
-
-#undef WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#include <ddk/ntddk.h>
-#define NTOS_MODE_USER
-#include <ntos.h>
-#include <win32k/text.h>
-#include <win32k/dc.h>
-#include <rosrtl/devmode.h>
-#include <rosrtl/logfont.h>
-#include <internal/heap.h>
+#include "precomp.h"
 
 #define UNIMPLEMENTED DbgPrint("GDI32: %s is unimplemented, please try again later.\n", __FUNCTION__);
 
@@ -619,4 +605,64 @@ UpdateICMRegKeyA(
 }
 
 
+/*
+ * @unimplemented
+ */
+BOOL
+STDCALL
+RemoveFontResourceExA(
+	LPCSTR lpFileName,
+	DWORD fl,
+	PVOID pdv
+)
+{
+	UNIMPLEMENTED;
+	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
+	return 0;
+}
+
+
+/*
+ * @unimplemented
+ */
+HFONT
+STDCALL
+CreateFontIndirectExA(const ENUMLOGFONTEXDVA *elfexd)
+{
+	UNIMPLEMENTED;
+	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
+	return 0;
+}
+
+/*
+ * @unimplemented
+ */
+DWORD
+STDCALL
+GetGlyphIndicesA(
+	HDC hdc,
+	LPCSTR lpstr,
+	int c,
+	LPWORD pgi,
+	DWORD fl
+)
+{
+	UNIMPLEMENTED;
+	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
+	return 0;
+}
+
+/*
+ * @unimplemented
+ */
+UINT
+STDCALL
+GetStringBitmapA(HDC hdc,LPSTR psz,BOOL unknown,UINT cj,BYTE *lpSB)
+{
+	UNIMPLEMENTED;
+	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
+	return 0;
+}
+
+
 /* EOF */
diff --git a/reactos/lib/gdi32/misc/stubsw.c b/reactos/lib/gdi32/misc/stubsw.c
index 3fc39a53f34..6cb26aede6c 100644
--- a/reactos/lib/gdi32/misc/stubsw.c
+++ b/reactos/lib/gdi32/misc/stubsw.c
@@ -1,4 +1,4 @@
-/* $Id: stubsw.c,v 1.31 2004/08/15 18:40:07 chorns Exp $
+/* $Id: stubsw.c,v 1.32 2004/09/06 21:15:45 weiden Exp $
  *
  * reactos/lib/gdi32/misc/stubs.c
  *
@@ -10,7 +10,6 @@
  */
 
 #include "precomp.h"
-#include <win32k/kapi.h>
 
 #define UNIMPLEMENTED DbgPrint("GDI32: %s is unimplemented, please try again later.\n", __FUNCTION__);
 
@@ -500,5 +499,147 @@ GetFontResourceInfoW(
 	return 0;
 }
 
+/*
+ * @unimplemented
+ */
+BOOL
+STDCALL
+EudcLoadLinkW(LPCWSTR pBaseFaceName,LPCWSTR pEudcFontPath,INT iPriority,INT iFontLinkType)
+{
+	UNIMPLEMENTED;
+	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
+	return 0;
+}
+
+/*
+ * @unimplemented
+ */
+BOOL
+STDCALL
+EudcUnloadLinkW(LPCWSTR pBaseFaceName,LPCWSTR pEudcFontPath)
+{
+	UNIMPLEMENTED;
+	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
+	return 0;
+}
+
+/*
+ * @unimplemented
+ */
+int
+STDCALL
+GdiAddFontResourceW(LPCWSTR filename,FLONG f,DESIGNVECTOR *pdv)
+{
+	UNIMPLEMENTED;
+	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
+	return 0;
+}
+
+/*
+ * @unimplemented
+ */
+BOOL
+STDCALL
+GdiConsoleTextOut(HDC hdc, POLYTEXTW *lpto,UINT nStrings, RECTL *prclBounds)
+{
+	UNIMPLEMENTED;
+	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
+	return 0;
+}
+
+/*
+ * @unimplemented
+ */
+DWORD
+STDCALL
+GetEUDCTimeStampExW(LPCWSTR str)
+{
+	UNIMPLEMENTED;
+	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
+	return 0;
+}
+
+/*
+ * @unimplemented
+ */
+BOOL
+STDCALL
+RemoveFontResourceExW(
+	LPCWSTR lpFileName,
+	DWORD fl,
+	PVOID pdv
+)
+{
+	UNIMPLEMENTED;
+	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
+	return 0;
+}
+
+/*
+ * @unimplemented
+ */
+BOOL
+STDCALL
+bInitSystemAndFontsDirectoriesW(LPWSTR *SystemDir,LPWSTR *FontsDir)
+{
+	UNIMPLEMENTED;
+	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
+	return 0;
+}
+
+/*
+ * @unimplemented
+ */
+BOOL
+STDCALL
+bMakePathNameW(LPWSTR lpBuffer,LPCWSTR lpFileName,LPWSTR *lpFilePart,DWORD unknown)
+{
+	UNIMPLEMENTED;
+	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
+	return 0;
+}
+
+/*
+ * @unimplemented
+ */
+HFONT
+STDCALL
+CreateFontIndirectExW(const ENUMLOGFONTEXDVW *elfexd)
+{
+	UNIMPLEMENTED;
+	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
+	return 0;
+}
+
+/*
+ * @unimplemented
+ */
+DWORD
+STDCALL
+GetGlyphIndicesW(
+	HDC hdc,
+	LPCWSTR lpstr,
+	int c,
+	LPWORD pgi,
+	DWORD fl
+)
+{
+	UNIMPLEMENTED;
+	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
+	return 0;
+}
+
+/*
+ * @unimplemented
+ */
+UINT
+STDCALL
+GetStringBitmapW(HDC hdc,LPWSTR pwsz,BOOL unknown,UINT cj,BYTE *lpSB)
+{
+	UNIMPLEMENTED;
+	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
+	return 0;
+}
+
 
 /* EOF */
diff --git a/reactos/lib/gdi32/misc/wingl.c b/reactos/lib/gdi32/misc/wingl.c
index e647eef31a4..361aa582cfc 100644
--- a/reactos/lib/gdi32/misc/wingl.c
+++ b/reactos/lib/gdi32/misc/wingl.c
@@ -22,7 +22,7 @@
  */
 
 #include "precomp.h"
-#include <string.h>
+
 #define NDEBUG
 #include <win32k/debug1.h>
 
diff --git a/reactos/lib/gdi32/objects/bitblt.c b/reactos/lib/gdi32/objects/bitblt.c
index c38c9cd0b71..b2d0efa99b3 100644
--- a/reactos/lib/gdi32/objects/bitblt.c
+++ b/reactos/lib/gdi32/objects/bitblt.c
@@ -1,4 +1,4 @@
-/* $Id: bitblt.c,v 1.23 2004/08/15 18:40:07 chorns Exp $
+/* $Id: bitblt.c,v 1.24 2004/09/06 21:15:45 weiden Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
@@ -8,7 +8,7 @@
  */
 
 #include "precomp.h"
-#include <win32k/kapi.h>
+
 #include <debug.h>
 
 /*
diff --git a/reactos/lib/gdi32/objects/brush.c b/reactos/lib/gdi32/objects/brush.c
index 0022462c7a8..4acdb3cb8cc 100644
--- a/reactos/lib/gdi32/objects/brush.c
+++ b/reactos/lib/gdi32/objects/brush.c
@@ -1,5 +1,4 @@
 #include "precomp.h"
-#include <win32k/kapi.h>
 
 
 /*
diff --git a/reactos/lib/gdi32/objects/clip.c b/reactos/lib/gdi32/objects/clip.c
index 071588e8a1c..009c7062020 100644
--- a/reactos/lib/gdi32/objects/clip.c
+++ b/reactos/lib/gdi32/objects/clip.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: clip.c,v 1.8 2004/08/15 18:40:07 chorns Exp $
+/* $Id: clip.c,v 1.9 2004/09/06 21:15:46 weiden Exp $
  *
  * PROJECT:         ReactOS gdi32.dll
  * FILE:            lib/gdi32/objects/clip.c
@@ -27,7 +27,6 @@
  */
 
 #include "precomp.h"
-#include <win32k/kapi.h>
 
 /*
  * @implemented
diff --git a/reactos/lib/gdi32/objects/dc.c b/reactos/lib/gdi32/objects/dc.c
index fe74b83622b..b4d8fafcda5 100644
--- a/reactos/lib/gdi32/objects/dc.c
+++ b/reactos/lib/gdi32/objects/dc.c
@@ -1,22 +1,8 @@
 #include "precomp.h"
-#include <win32k/kapi.h>
-#include <rosrtl/logfont.h>
 
 #define NDEBUG
 #include <debug.h>
 
-#define NtUserGetDCBrushColor(hbr) \
-  (COLORREF)NtUserCallTwoParam((DWORD)(hbr), OBJ_BRUSH, TWOPARAM_ROUTINE_GETDCCOLOR)
-
-#define NtUserGetDCPenColor(hbr) \
-  (COLORREF)NtUserCallTwoParam((DWORD)(hbr), OBJ_PEN, TWOPARAM_ROUTINE_GETDCCOLOR)
-
-#define NtUserSetDCBrushColor(hbr, crColor) \
-  (COLORREF)NtUserCallTwoParam((DWORD)(hbr), (DWORD)crColor, TWOPARAM_ROUTINE_SETDCBRUSHCOLOR)
-
-#define NtUserSetDCPenColor(hbr, crColor) \
-  (COLORREF)NtUserCallTwoParam((DWORD)(hbr), (DWORD)crColor, TWOPARAM_ROUTINE_SETDCPENCOLOR)
-
 /*
  * @implemented
  */
diff --git a/reactos/lib/gdi32/objects/fillshap.c b/reactos/lib/gdi32/objects/fillshap.c
index 29ee777abfb..6cd13554798 100644
--- a/reactos/lib/gdi32/objects/fillshap.c
+++ b/reactos/lib/gdi32/objects/fillshap.c
@@ -1,5 +1,4 @@
 #include "precomp.h"
-#include <win32k/kapi.h>
 
 /*
  * @implemented
diff --git a/reactos/lib/gdi32/objects/font.c b/reactos/lib/gdi32/objects/font.c
index f69b9ed473f..56bebf9f56c 100644
--- a/reactos/lib/gdi32/objects/font.c
+++ b/reactos/lib/gdi32/objects/font.c
@@ -1,4 +1,4 @@
-/* $Id: font.c,v 1.8 2004/08/15 18:40:07 chorns Exp $
+/* $Id: font.c,v 1.9 2004/09/06 21:15:46 weiden Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
@@ -9,11 +9,6 @@
  */
 
 #include "precomp.h"
-#include <rosrtl/logfont.h>
-#include <win32k/font.h>
-#include <win32k/text.h>
-#include <internal/font.h>
-#include <wine/unicode.h>
 
 #define NDEBUG
 #include <debug.h>
diff --git a/reactos/lib/gdi32/objects/line.c b/reactos/lib/gdi32/objects/line.c
index 44980c15365..72b51d404fe 100644
--- a/reactos/lib/gdi32/objects/line.c
+++ b/reactos/lib/gdi32/objects/line.c
@@ -1,5 +1,4 @@
 #include "precomp.h"
-#include <win32k/kapi.h>
 
 
 /*
diff --git a/reactos/lib/gdi32/objects/linedda.c b/reactos/lib/gdi32/objects/linedda.c
index 9edf21d150a..7bbd98d95cd 100644
--- a/reactos/lib/gdi32/objects/linedda.c
+++ b/reactos/lib/gdi32/objects/linedda.c
@@ -28,7 +28,7 @@
  */
 
 #include "precomp.h"
-#include <win32k/kapi.h>
+
 #include <debug.h>
 
 /**********************************************************************
diff --git a/reactos/lib/gdi32/objects/metafile.c b/reactos/lib/gdi32/objects/metafile.c
index ed5db02b4f1..cfa5ea9090c 100644
--- a/reactos/lib/gdi32/objects/metafile.c
+++ b/reactos/lib/gdi32/objects/metafile.c
@@ -1,8 +1,4 @@
 #include "precomp.h"
-#include <string.h>
-#include <internal/heap.h>
-#include <win32k/kapi.h>
-#include <win32k/metafile.h>
 
 
 /*
diff --git a/reactos/lib/gdi32/objects/pen.c b/reactos/lib/gdi32/objects/pen.c
index 9ff2a9d9e7a..f6fed9414b8 100644
--- a/reactos/lib/gdi32/objects/pen.c
+++ b/reactos/lib/gdi32/objects/pen.c
@@ -1,5 +1,4 @@
 #include "precomp.h"
-#include <win32k/kapi.h>
 
 
 /*
diff --git a/reactos/lib/gdi32/objects/region.c b/reactos/lib/gdi32/objects/region.c
index 0f53ef9f643..718cf7ad413 100644
--- a/reactos/lib/gdi32/objects/region.c
+++ b/reactos/lib/gdi32/objects/region.c
@@ -1,5 +1,4 @@
 #include "precomp.h"
-#include <win32k/kapi.h>
 
 
 /*
diff --git a/reactos/lib/gdi32/objects/text.c b/reactos/lib/gdi32/objects/text.c
index 5fd4c4e55ee..e56731b530d 100644
--- a/reactos/lib/gdi32/objects/text.c
+++ b/reactos/lib/gdi32/objects/text.c
@@ -1,8 +1,4 @@
 #include "precomp.h"
-#include <string.h>
-#include <win32k/kapi.h>
-#include <internal/font.h>
-#include <rosrtl/logfont.h>
 
 
 /*