diff --git a/dlls/gdi/freetype.c b/dlls/gdi/freetype.c
index ba1e13921da..65e7cc9952f 100644
--- a/dlls/gdi/freetype.c
+++ b/dlls/gdi/freetype.c
@@ -31,7 +31,6 @@
 #include "wine/port.h"
 #include "wine/debug.h"
 #include "gdi.h"
-#include "font.h"
 
 #include <stdlib.h>
 #include <sys/stat.h>
diff --git a/dlls/gdi/mfdrv/objects.c b/dlls/gdi/mfdrv/objects.c
index ef84200c818..4502c2e9ce6 100644
--- a/dlls/gdi/mfdrv/objects.c
+++ b/dlls/gdi/mfdrv/objects.c
@@ -23,7 +23,6 @@
 #include <string.h>
 
 #include "bitmap.h"
-#include "font.h"
 #include "wownt32.h"
 #include "mfdrv/metafiledrv.h"
 #include "wine/debug.h"
diff --git a/dlls/gdi/win16drv/init.c b/dlls/gdi/win16drv/init.c
index c4cffe4e423..d96385f777e 100644
--- a/dlls/gdi/win16drv/init.c
+++ b/dlls/gdi/win16drv/init.c
@@ -30,7 +30,6 @@
 #include "win16drv/win16drv.h"
 #include "gdi.h"
 #include "bitmap.h"
-#include "font.h"
 #include "wine/debug.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(win16drv);
diff --git a/dlls/ntdll/signal_powerpc.c b/dlls/ntdll/signal_powerpc.c
index d8f302dce89..7b0df2a457c 100644
--- a/dlls/ntdll/signal_powerpc.c
+++ b/dlls/ntdll/signal_powerpc.c
@@ -58,7 +58,6 @@
 #include "stackframe.h"
 #include "global.h"
 #include "miscemu.h"
-#include "syslevel.h"
 #include "wine/debug.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(seh);
diff --git a/dlls/ttydrv/objects.c b/dlls/ttydrv/objects.c
index bc7534bcef9..c9ebb296bb4 100644
--- a/dlls/ttydrv/objects.c
+++ b/dlls/ttydrv/objects.c
@@ -20,7 +20,6 @@
 
 #include "config.h"
 
-#include "bitmap.h"
 #include "gdi.h"
 #include "ttydrv.h"
 #include "wine/debug.h"
diff --git a/dlls/ttydrv/ttydrv.h b/dlls/ttydrv/ttydrv.h
index 6249f019bb0..dcf7ee052d3 100644
--- a/dlls/ttydrv/ttydrv.h
+++ b/dlls/ttydrv/ttydrv.h
@@ -36,18 +36,9 @@
 
 #include "windef.h"
 #include "wingdi.h"
-#include "wine/winuser16.h"
-#include "wine/wingdi16.h"
-#include "user.h"
+#include "winuser.h"
 
 struct tagBITMAPOBJ;
-struct tagCLASS;
-struct tagDESKTOP;
-struct tagPALETTEOBJ;
-struct tagWND;
-struct tagCURSORICONINFO;
-struct tagCREATESTRUCTA;
-struct tagWINDOWPOS;
 
 #if defined(HAVE_LIBCURSES) || defined(HAVE_LIBNCURSES)
 #define WINE_CURSES
@@ -82,7 +73,6 @@ extern BOOL TTYDRV_DC_DeleteDC(TTYDRV_PDEVICE *physDev);
 extern BOOL TTYDRV_DC_BitBlt(TTYDRV_PDEVICE *physDevDst, INT xDst, INT yDst, INT width, INT height, TTYDRV_PDEVICE *physDevSrc, INT xSrc, INT ySrc, DWORD rop);
 extern BOOL TTYDRV_DC_Chord(TTYDRV_PDEVICE *physDev, INT left, INT top, INT right, INT bottom, INT xstart, INT ystart, INT xend, INT yend);
 extern BOOL TTYDRV_DC_Ellipse(TTYDRV_PDEVICE *physDev, INT left, INT top, INT right, INT bottom);
-extern INT TTYDRV_DC_Escape(TTYDRV_PDEVICE *physDev, INT nEscape, INT cbInput, SEGPTR lpInData, SEGPTR lpOutData);
 extern BOOL TTYDRV_DC_ExtFloodFill(TTYDRV_PDEVICE *physDev, INT x, INT y, COLORREF color, UINT fillType);
 extern BOOL TTYDRV_DC_ExtTextOut(TTYDRV_PDEVICE *physDev, INT x, INT y, UINT flags, const RECT *lpRect, LPCWSTR str, UINT count, const INT *lpDx);
 extern BOOL TTYDRV_DC_GetCharWidth(TTYDRV_PDEVICE *physDev, UINT firstChar, UINT lastChar, LPINT buffer);
diff --git a/dlls/ttydrv/ttydrv_main.c b/dlls/ttydrv/ttydrv_main.c
index af098840650..b46b64d750c 100644
--- a/dlls/ttydrv/ttydrv_main.c
+++ b/dlls/ttydrv/ttydrv_main.c
@@ -24,9 +24,6 @@
 
 #include "winbase.h"
 #include "wine/winbase16.h"
-#include "gdi.h"
-#include "user.h"
-#include "win.h"
 #include "wine/debug.h"
 #include "ttydrv.h"
 
diff --git a/dlls/ttydrv/user.c b/dlls/ttydrv/user.c
index ff1c58759f0..f778bc9315c 100644
--- a/dlls/ttydrv/user.c
+++ b/dlls/ttydrv/user.c
@@ -27,6 +27,7 @@
 
 WINE_DEFAULT_DEBUG_CHANNEL(ttydrv);
 
+struct tagCURSORICONINFO;
 
 /***********************************************************************
  *		VkKeyScan (TTYDRV.@)
diff --git a/include/x11font.h b/dlls/x11drv/x11font.h
similarity index 100%
rename from include/x11font.h
rename to dlls/x11drv/x11font.h
diff --git a/graphics/fontengine.c b/graphics/fontengine.c
index 606eefda567..31d572bb2d3 100644
--- a/graphics/fontengine.c
+++ b/graphics/fontengine.c
@@ -22,7 +22,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include "winbase.h"
-#include "font.h"
+#include "wine/wingdi16.h"
 #include "wine/debug.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(font);
diff --git a/graphics/painting.c b/graphics/painting.c
index 27ca380abfc..28a1ed7b456 100644
--- a/graphics/painting.c
+++ b/graphics/painting.c
@@ -31,7 +31,6 @@
 #include "winerror.h"
 #include "gdi.h"
 #include "bitmap.h"
-#include "path.h"
 #include "wine/debug.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(gdi);
diff --git a/graphics/path.c b/graphics/path.c
index d74aae5c478..8460bcbc007 100644
--- a/graphics/path.c
+++ b/graphics/path.c
@@ -35,7 +35,6 @@
 
 #include "gdi.h"
 #include "wine/debug.h"
-#include "path.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(gdi);
 
diff --git a/graphics/x11drv/xfont.c b/graphics/x11drv/xfont.c
index 73908a95e88..04d9ca0701b 100644
--- a/graphics/x11drv/xfont.c
+++ b/graphics/x11drv/xfont.c
@@ -43,8 +43,6 @@
 #include "wingdi.h"
 #include "winnls.h"
 #include "winreg.h"
-#include "font.h"
-#include "user.h" /* for TWEAK_WineLook (FIXME) */
 #include "x11font.h"
 #include "wine/library.h"
 #include "wine/unicode.h"
diff --git a/include/font.h b/include/font.h
deleted file mode 100644
index 4ce24787fee..00000000000
--- a/include/font.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * GDI font definitions
- *
- * Copyright 1994 Alexandre Julliard
- *
- * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-#ifndef __WINE_FONT_H
-#define __WINE_FONT_H
-
-#include "gdi.h"
-
-extern BOOL FONT_Init( UINT16* pTextCaps );
-extern LPWSTR FONT_mbtowc(HDC, LPCSTR, INT, INT*, UINT*);
-
-extern INT WineEngAddFontResourceEx(LPCWSTR, DWORD, PVOID);
-extern GdiFont WineEngCreateFontInstance(DC*, HFONT);
-extern BOOL WineEngDestroyFontInstance(HFONT handle);
-extern DWORD WineEngEnumFonts(LPLOGFONTW, DEVICEFONTENUMPROC, LPARAM);
-extern BOOL WineEngGetCharWidth(GdiFont, UINT, UINT, LPINT);
-extern DWORD WineEngGetFontData(GdiFont, DWORD, DWORD, LPVOID, DWORD);
-extern DWORD WineEngGetGlyphIndices(GdiFont font, LPCWSTR lpstr, INT count,
-				    LPWORD pgi, DWORD flags);
-extern DWORD WineEngGetGlyphOutline(GdiFont, UINT glyph, UINT format,
-				    LPGLYPHMETRICS, DWORD buflen, LPVOID buf,
-				    const MAT2*);
-extern UINT WineEngGetOutlineTextMetrics(GdiFont, UINT, LPOUTLINETEXTMETRICW);
-extern BOOL WineEngGetTextExtentPoint(GdiFont, LPCWSTR, INT, LPSIZE);
-extern BOOL WineEngGetTextExtentPointI(GdiFont, const WORD *, INT, LPSIZE);
-extern INT  WineEngGetTextFace(GdiFont, INT, LPWSTR);
-extern BOOL WineEngGetTextMetrics(GdiFont, LPTEXTMETRICW);
-extern BOOL WineEngInit(void);
-extern BOOL WineEngRemoveFontResourceEx(LPCWSTR, DWORD, PVOID);
-
-#endif /* __WINE_FONT_H */
diff --git a/include/gdi.h b/include/gdi.h
index f8ac70cf83d..7a190ee4520 100644
--- a/include/gdi.h
+++ b/include/gdi.h
@@ -24,7 +24,6 @@
 #include "windef.h"
 #include "wingdi.h"
 #include "wine/wingdi16.h"
-#include "path.h"
 #include <math.h>
 
   /* GDI objects magic numbers */
@@ -71,6 +70,27 @@ typedef struct tagGDIOBJHDR
 } GDIOBJHDR;
 
 
+/* It should not be necessary to access the contents of the GdiPath
+ * structure directly; if you find that the exported functions don't
+ * allow you to do what you want, then please place a new exported
+ * function that does this job in path.c.
+ */
+typedef enum tagGdiPathState
+{
+   PATH_Null,
+   PATH_Open,
+   PATH_Closed
+} GdiPathState;
+
+typedef struct tagGdiPath
+{
+   GdiPathState state;
+   POINT      *pPoints;
+   BYTE         *pFlags;
+   int          numEntriesUsed, numEntriesAllocated;
+   BOOL       newStroke;
+} GdiPath;
+
 typedef struct tagGdiFont *GdiFont;
 
 typedef struct { int opaque; } *PHYSDEV;  /* PHYSDEV is an opaque pointer */
@@ -447,6 +467,26 @@ extern void CLIPPING_UpdateGCRegion( DC * dc );
 /* enhmetafile.c */
 extern HENHMETAFILE EMF_Create_HENHMETAFILE(ENHMETAHEADER *emh, BOOL on_disk );
 
+/* freetype.c */
+extern INT WineEngAddFontResourceEx(LPCWSTR, DWORD, PVOID);
+extern GdiFont WineEngCreateFontInstance(DC*, HFONT);
+extern BOOL WineEngDestroyFontInstance(HFONT handle);
+extern DWORD WineEngEnumFonts(LPLOGFONTW, DEVICEFONTENUMPROC, LPARAM);
+extern BOOL WineEngGetCharWidth(GdiFont, UINT, UINT, LPINT);
+extern DWORD WineEngGetFontData(GdiFont, DWORD, DWORD, LPVOID, DWORD);
+extern DWORD WineEngGetGlyphIndices(GdiFont font, LPCWSTR lpstr, INT count,
+				    LPWORD pgi, DWORD flags);
+extern DWORD WineEngGetGlyphOutline(GdiFont, UINT glyph, UINT format,
+				    LPGLYPHMETRICS, DWORD buflen, LPVOID buf,
+				    const MAT2*);
+extern UINT WineEngGetOutlineTextMetrics(GdiFont, UINT, LPOUTLINETEXTMETRICW);
+extern BOOL WineEngGetTextExtentPoint(GdiFont, LPCWSTR, INT, LPSIZE);
+extern BOOL WineEngGetTextExtentPointI(GdiFont, const WORD *, INT, LPSIZE);
+extern INT  WineEngGetTextFace(GdiFont, INT, LPWSTR);
+extern BOOL WineEngGetTextMetrics(GdiFont, LPTEXTMETRICW);
+extern BOOL WineEngInit(void);
+extern BOOL WineEngRemoveFontResourceEx(LPCWSTR, DWORD, PVOID);
+
 /* metafile.c */
 extern HMETAFILE MF_Create_HMETAFILE(METAHEADER *mh);
 extern HMETAFILE16 MF_Create_HMETAFILE16(METAHEADER *mh);
@@ -459,6 +499,37 @@ extern BOOL REGION_FrameRgn( HRGN dest, HRGN src, INT x, INT y );
 extern HPALETTE WINAPI GDISelectPalette( HDC hdc, HPALETTE hpal, WORD wBkg);
 extern UINT WINAPI GDIRealizePalette( HDC hdc );
 
+/* path.c */
+
+#define PATH_IsPathOpen(path) ((path).state==PATH_Open)
+/* Returns TRUE if the specified path is in the open state, i.e. in the
+ * state where points will be added to the path, or FALSE otherwise. This
+ * function is implemented as a macro for performance reasons.
+ */
+
+extern void PATH_InitGdiPath(GdiPath *pPath);
+extern void PATH_DestroyGdiPath(GdiPath *pPath);
+extern BOOL PATH_AssignGdiPath(GdiPath *pPathDest, const GdiPath *pPathSrc);
+
+extern BOOL PATH_MoveTo(DC *dc);
+extern BOOL PATH_LineTo(DC *dc, INT x, INT y);
+extern BOOL PATH_Rectangle(DC *dc, INT x1, INT y1, INT x2, INT y2);
+extern BOOL PATH_Ellipse(DC *dc, INT x1, INT y1, INT x2, INT y2);
+extern BOOL PATH_Arc(DC *dc, INT x1, INT y1, INT x2, INT y2,
+                     INT xStart, INT yStart, INT xEnd, INT yEnd, INT lines);
+extern BOOL PATH_PolyBezierTo(DC *dc, const POINT *pt, DWORD cbCount);
+extern BOOL PATH_PolyBezier(DC *dc, const POINT *pt, DWORD cbCount);
+extern BOOL PATH_PolylineTo(DC *dc, const POINT *pt, DWORD cbCount);
+extern BOOL PATH_Polyline(DC *dc, const POINT *pt, DWORD cbCount);
+extern BOOL PATH_Polygon(DC *dc, const POINT *pt, DWORD cbCount);
+extern BOOL PATH_PolyPolyline(DC *dc, const POINT *pt, const DWORD *counts, DWORD polylines);
+extern BOOL PATH_PolyPolygon(DC *dc, const POINT *pt, const INT *counts, UINT polygons);
+extern BOOL PATH_RoundRect(DC *dc, INT x1, INT y1, INT x2, INT y2, INT ell_width, INT ell_height);
+extern BOOL PATH_AddEntry(GdiPath *pPath, const POINT *pPoint, BYTE flags);
+
+/* text.c */
+extern LPWSTR FONT_mbtowc(HDC, LPCSTR, INT, INT*, UINT*);
+
 #define WINE_GGO_GRAY16_BITMAP 0x7f
 
 #endif  /* __WINE_GDI_H */
diff --git a/include/path.h b/include/path.h
deleted file mode 100644
index 4eba03d2962..00000000000
--- a/include/path.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * Graphics paths (BeginPath, EndPath etc.)
- *
- * Copyright 1997, 1998 Martin Boehme
- *
- * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-#ifndef __WINE_PATH_H
-#define __WINE_PATH_H
-
-#include "windef.h"
-
-/* It should not be necessary to access the contents of the GdiPath
- * structure directly; if you find that the exported functions don't
- * allow you to do what you want, then please place a new exported
- * function that does this job in path.c.
- */
-
-typedef enum tagGdiPathState
-{
-   PATH_Null,
-   PATH_Open,
-   PATH_Closed
-} GdiPathState;
-
-typedef struct tagGdiPath
-{
-   GdiPathState state;
-   POINT      *pPoints;
-   BYTE         *pFlags;
-   int          numEntriesUsed, numEntriesAllocated;
-   BOOL       newStroke;
-} GdiPath;
-
-#define PATH_IsPathOpen(path) ((path).state==PATH_Open)
-/* Returns TRUE if the specified path is in the open state, i.e. in the
- * state where points will be added to the path, or FALSE otherwise. This
- * function is implemented as a macro for performance reasons.
- */
-
-extern void   PATH_InitGdiPath(GdiPath *pPath);
-extern void   PATH_DestroyGdiPath(GdiPath *pPath);
-extern BOOL PATH_AssignGdiPath(GdiPath *pPathDest,
-   const GdiPath *pPathSrc);
-
-struct tagDC;
-
-extern BOOL PATH_MoveTo(struct tagDC *dc);
-extern BOOL PATH_LineTo(struct tagDC *dc, INT x, INT y);
-extern BOOL PATH_Rectangle(struct tagDC *dc, INT x1, INT y1,
-   INT x2, INT y2);
-extern BOOL PATH_Ellipse(struct tagDC *dc, INT x1, INT y1,
-   INT x2, INT y2);
-extern BOOL PATH_Arc(struct tagDC *dc, INT x1, INT y1, INT x2, INT y2,
-   INT xStart, INT yStart, INT xEnd, INT yEnd, INT lines);
-extern BOOL PATH_PolyBezierTo(struct tagDC *dc, const POINT *pt, DWORD cbCount);
-extern BOOL PATH_PolyBezier(struct tagDC *dc, const POINT *pt, DWORD cbCount);
-extern BOOL PATH_PolylineTo(struct tagDC *dc, const POINT *pt, DWORD cbCount);
-extern BOOL PATH_Polyline(struct tagDC *dc, const POINT *pt, DWORD cbCount);
-extern BOOL PATH_Polygon(struct tagDC *dc, const POINT *pt, DWORD cbCount);
-extern BOOL PATH_PolyPolyline(struct tagDC *dc, const POINT *pt, const DWORD *counts,
-			      DWORD polylines);
-extern BOOL PATH_PolyPolygon(struct tagDC *dc, const POINT *pt, const INT *counts,
-			     UINT polygons);
-extern BOOL PATH_RoundRect(struct tagDC *dc, INT x1, INT y1, INT x2, INT y2, INT ell_width,
-				INT ell_height);
-extern BOOL PATH_AddEntry(GdiPath *pPath, const POINT *pPoint, BYTE flags);
-#endif /* __WINE_PATH_H */
-
-
diff --git a/loader/task.c b/loader/task.c
index ebf6d0b2d8f..bd4d5738cef 100644
--- a/loader/task.c
+++ b/loader/task.c
@@ -38,7 +38,6 @@
 #include "file.h"
 #include "global.h"
 #include "instance.h"
-#include "miscemu.h"
 #include "module.h"
 #include "winternl.h"
 #include "selectors.h"
diff --git a/objects/dc.c b/objects/dc.c
index 9000922d273..40a7be5c895 100644
--- a/objects/dc.c
+++ b/objects/dc.c
@@ -29,7 +29,6 @@
 #include "wine/winuser16.h"
 #include "gdi.h"
 #include "heap.h"
-#include "font.h"
 #include "wine/debug.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(dc);
diff --git a/objects/font.c b/objects/font.c
index 1f55b52b12a..63fac1ba2cc 100644
--- a/objects/font.c
+++ b/objects/font.c
@@ -28,10 +28,9 @@
 #include "winerror.h"
 #include "winnls.h"
 #include "wownt32.h"
-#include "wine/unicode.h"
-#include "font.h"
-#include "wine/debug.h"
 #include "gdi.h"
+#include "wine/unicode.h"
+#include "wine/debug.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(font);
 WINE_DECLARE_DEBUG_CHANNEL(gdi);
diff --git a/objects/gdiobj.c b/objects/gdiobj.c
index a742770b020..f08b85ec599 100644
--- a/objects/gdiobj.c
+++ b/objects/gdiobj.c
@@ -30,11 +30,10 @@
 #include "winerror.h"
 
 #include "bitmap.h"
-#include "font.h"
 #include "local.h"
 #include "palette.h"
-#include "wine/debug.h"
 #include "gdi.h"
+#include "wine/debug.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(gdi);