Removed some unnecessary #includes and dll dependencies.

2000-08-09 22:35:05 +00:00 · 2000-08-09 22:35:05 +00:00 · 5ab9d860f2
parent 52900c818f
commit 5ab9d860f2
40 changed files with 60 additions and 117 deletions
--- a/controls/icontitle.c
+++ b/controls/icontitle.c
@ -12,7 +12,6 @@
 #include "winuser.h"
 #include "wine/winuser16.h"
 #include "win.h"
-#include "desktop.h"
 #include "heap.h"

 	BOOL	bMultiLineTitle;
--- a/controls/widgets.c
+++ b/controls/widgets.c
@ -15,7 +15,6 @@
 #include "heap.h"
 #include "mdi.h"
 #include "menu.h"
-#include "module.h"
 #include "scroll.h"
 #include "static.h"

--- a/dlls/comctl32/tab.c
+++ b/dlls/comctl32/tab.c
@ -17,7 +17,6 @@
 #include "commctrl.h"
 #include "debugtools.h"
 #include "cache.h"
-#include "win.h"

 DEFAULT_DEBUG_CHANNEL(tab);

@ -1257,15 +1256,12 @@ TAB_DrawItemInterior
  if ( (lStyle & TCS_OWNERDRAWFIXED) && GetParent(hwnd) )
  {
    DRAWITEMSTRUCT dis;
-    WND *pwndPtr;
    UINT id;

    /*
     * get the control id
     */
-    pwndPtr = WIN_FindWndPtr( hwnd );
-    id = pwndPtr->wIDmenu;
-    WIN_ReleaseWndPtr(pwndPtr);
+    id = GetWindowLongA( hwnd, GWL_ID );

    /* 
     * put together the DRAWITEMSTRUCT
--- a/dlls/crtdll/crtdll_main.c
+++ b/dlls/crtdll/crtdll_main.c
@ -50,7 +50,6 @@ UB 000416:
 #include "winerror.h"
 #include "ntddk.h"
 #include "debugtools.h"
-#include "module.h"
 #include "heap.h"
 #include "crtdll.h"
 #include "drive.h"
--- a/dlls/ddraw/ddraw/dga.c
+++ b/dlls/ddraw/ddraw/dga.c
@ -33,7 +33,6 @@
 #include "ddraw.h"
 #include "d3d.h"
 #include "debugtools.h"
-#include "message.h"
 #include "options.h"

 #define RESTORE_SIGNALS
--- a/dlls/ddraw/ddraw/main.c
+++ b/dlls/ddraw/ddraw/main.c
@ -22,7 +22,6 @@
 #include "ddraw.h"
 #include "d3d.h"
 #include "debugtools.h"
-#include "message.h"
 #include "options.h"

 DEFAULT_DEBUG_CHANNEL(ddraw);
--- a/dlls/ddraw/ddraw/x11.c
+++ b/dlls/ddraw/ddraw/x11.c
@ -21,7 +21,6 @@
 #include "d3d.h"
 #include "win.h"
 #include "debugtools.h"
-#include "message.h"
 #include "options.h"

 DEFAULT_DEBUG_CHANNEL(ddraw);
--- a/dlls/ddraw/dga.c
+++ b/dlls/ddraw/dga.c
@ -26,15 +26,11 @@
 #include <string.h>
 #include <stdio.h>

-#include "gdi.h"
 #include "heap.h"
-#include "dc.h"
-#include "win.h"
 #include "wine/exception.h"
 #include "ddraw.h"
 #include "d3d.h"
 #include "debugtools.h"
-#include "message.h"
 #include "options.h"

 #include "dga_private.h"
--- a/dlls/ddraw/dga2.c
+++ b/dlls/ddraw/dga2.c
@ -17,13 +17,10 @@

 #include "gdi.h"
 #include "heap.h"
-#include "dc.h"
-#include "win.h"
 #include "wine/exception.h"
 #include "ddraw.h"
 #include "d3d.h"
 #include "debugtools.h"
-#include "message.h"
 #include "options.h"

 #include "dga2_private.h"
--- a/dlls/ddraw/direct3d/main.c
+++ b/dlls/ddraw/direct3d/main.c
@ -9,7 +9,6 @@
 #include "winerror.h"
 #include "ddraw.h"
 #include "d3d.h"
-#include "message.h"
 #include "options.h"
 #include "debugtools.h"

--- a/dlls/ddraw/direct3d/mesa.c
+++ b/dlls/ddraw/direct3d/mesa.c
@ -9,7 +9,6 @@
 #include "winerror.h"
 #include "ddraw.h"
 #include "d3d.h"
-#include "message.h"
 #include "options.h"
 #include "debugtools.h"

--- a/dlls/ddraw/helper.c
+++ b/dlls/ddraw/helper.c
@ -15,15 +15,11 @@
 #include <stdio.h>

 #include "winerror.h"
-#include "gdi.h"
 #include "heap.h"
-#include "dc.h"
-#include "win.h"
 #include "wine/exception.h"
 #include "ddraw.h"
 #include "d3d.h"
 #include "debugtools.h"
-#include "message.h"
 #include "options.h"

 DEFAULT_DEBUG_CHANNEL(ddraw);
--- a/dlls/ddraw/main.c
+++ b/dlls/ddraw/main.c
@ -15,11 +15,8 @@

 #include "winerror.h"
 #include "heap.h"
-#include "dc.h"
-#include "win.h"
 #include "wine/exception.h"
 #include "debugtools.h"
-#include "message.h"

 #include "initguid.h"
 #include "ddraw.h"
@ -232,12 +229,12 @@ static LRESULT WINAPI DDWndProc(HWND hwnd,UINT msg,WPARAM wParam,LPARAM lParam)
 	    ret = DefWindowProcA( ddraw->d->mainWindow, msg, wParam, lParam );

 	    if( !ret ) {
-		WND *tmpWnd =WIN_FindWndPtr(ddraw->d->mainWindow);
 		/* We didn't handle the message - give it to the application */
-		if (ddraw && ddraw->d->mainWindow && tmpWnd)
-		    ret = CallWindowProcA(tmpWnd->winproc,
-		ddraw->d->mainWindow, msg, wParam, lParam );
-		WIN_ReleaseWndPtr(tmpWnd);
+		if (ddraw && ddraw->d->mainWindow)
+                {
+                    WNDPROC winproc = (WNDPROC)GetWindowLongA( ddraw->d->mainWindow, GWL_WNDPROC );
+		    ret = CallWindowProcA(winproc, ddraw->d->mainWindow, msg, wParam, lParam );
+                }
 	    }
 	    return ret;
 	} /* else FALLTHROUGH */
--- a/dlls/dinput/dinput_main.c
+++ b/dlls/dinput/dinput_main.c
@ -42,7 +42,6 @@
 #include "debugtools.h"
 #include "input.h"
 #include "user.h"
-#include "message.h"
 #include "mouse.h"
 #include "winbase.h"
 #include "winerror.h"
@ -381,7 +380,7 @@ static void fill_DataFormat(void *out, void *in, DataFormat *df) {
  }
 }

-static DataFormat *create_DataFormat(DIDATAFORMAT *wine_format, DIDATAFORMAT *asked_format, int *offset) {
+static DataFormat *create_DataFormat(DIDATAFORMAT *wine_format, LPCDIDATAFORMAT asked_format, int *offset) {
  DataFormat *ret;
  DataTransform *dt;
  int i, j;
--- a/dlls/msacm/msacmdrv.h
+++ b/dlls/msacm/msacmdrv.h
--- a/dlls/ole32/compobj.c
+++ b/dlls/ole32/compobj.c
@ -19,7 +19,6 @@
 #include "wine/winbase16.h"
 #include "winerror.h"
 #include "wownt32.h"
-#include "ole.h"
 #include "ole2ver.h"
 #include "debugtools.h"
 #include "file.h"
@ -519,7 +518,7 @@ HRESULT WINAPI CLSIDFromString(
 	CLSID *id		/* [out] GUID represented by above string */
 ) {
    LPOLESTR16      xid = HEAP_strdupWtoA(GetProcessHeap(),0,idstr);
-    OLESTATUS       ret = CLSIDFromString16(xid,id);
+    HRESULT       ret = CLSIDFromString16(xid,id);

    HeapFree(GetProcessHeap(),0,xid);
    if(ret != S_OK) { /* It appears a ProgID is also valid */
@ -535,7 +534,7 @@ HRESULT WINAPI CLSIDFromString(
 * NOTES
 *
 * RETURNS
- *	the string representation and OLESTATUS
+ *	the string representation and HRESULT
 */
 static HRESULT WINE_StringFromCLSID(
 	const CLSID *id,	/* [in] GUID to be converted */
@ -567,7 +566,7 @@ static HRESULT WINE_StringFromCLSID(

  TRACE("%p->%s\n", id, idstr);

-  return OLE_OK;
+  return S_OK;
 }

 /******************************************************************************
@ -575,7 +574,7 @@ static HRESULT WINE_StringFromCLSID(
 * Converts a GUID into the respective string representation.
 * The target string is allocated using the OLE IMalloc.
 * RETURNS
- *	the string representation and OLESTATUS
+ *	the string representation and HRESULT
 */
 HRESULT WINAPI StringFromCLSID16(
        REFCLSID id,            /* [in] the GUID to be converted */
@ -583,7 +582,7 @@ HRESULT WINAPI StringFromCLSID16(

 ) {
    LPMALLOC16	mllc;
-    OLESTATUS	ret;
+    HRESULT	ret;
    DWORD	args[2];

    ret = CoGetMalloc16(0,&mllc);
@ -615,14 +614,14 @@ HRESULT WINAPI StringFromCLSID16(
 * Converts a GUID into the respective string representation.
 * The target string is allocated using the OLE IMalloc.
 * RETURNS
- *	the string representation and OLESTATUS
+ *	the string representation and HRESULT
 */
 HRESULT WINAPI StringFromCLSID(
        REFCLSID id,            /* [in] the GUID to be converted */
 	LPOLESTR *idstr	/* [out] a pointer to a to-be-allocated pointer pointing to the resulting string */
 ) {
 	char            buf[80];
-	OLESTATUS       ret;
+	HRESULT       ret;
 	LPMALLOC	mllc;

 	if ((ret=CoGetMalloc(0,&mllc)))
@ -752,7 +751,7 @@ HRESULT WINAPI CLSIDFromProgID(
 	LPCLSID riid		/* [out] associated CLSID */
 ) {
 	LPOLESTR16 pid = HEAP_strdupWtoA(GetProcessHeap(),0,progid);
-	OLESTATUS       ret = CLSIDFromProgID16(pid,riid);
+	HRESULT       ret = CLSIDFromProgID16(pid,riid);

 	HeapFree(GetProcessHeap(),0,pid);
 	return ret;
@ -803,7 +802,7 @@ HRESULT WINAPI ReadClassStm(IStream *pStm,REFCLSID rclsid)
 /***********************************************************************
 *           LookupETask (COMPOBJ.94)
 */
-OLESTATUS WINAPI LookupETask16(HTASK16 *hTask,LPVOID p) {
+HRESULT WINAPI LookupETask16(HTASK16 *hTask,LPVOID p) {
 	FIXME("(%p,%p),stub!\n",hTask,p);
 	if ((*hTask = GetCurrentTask()) == hETask) {
 		memcpy(p, Table_ETask, sizeof(Table_ETask));
@ -815,7 +814,7 @@ OLESTATUS WINAPI LookupETask16(HTASK16 *hTask,LPVOID p) {
 /***********************************************************************
 *           SetETask (COMPOBJ.95)
 */
-OLESTATUS WINAPI SetETask16(HTASK16 hTask, LPVOID p) {
+HRESULT WINAPI SetETask16(HTASK16 hTask, LPVOID p) {
        FIXME("(%04x,%p),stub!\n",hTask,p);
 	hETask = hTask;
 	return 0;
@ -825,7 +824,7 @@ OLESTATUS WINAPI SetETask16(HTASK16 hTask, LPVOID p) {
 /***********************************************************************
 *           CallObjectInWOW (COMPOBJ.201)
 */
-OLESTATUS WINAPI CallObjectInWOW(LPVOID p1,LPVOID p2) {
+HRESULT WINAPI CallObjectInWOW(LPVOID p1,LPVOID p2) {
 	FIXME("(%p,%p),stub!\n",p1,p2);
 	return 0;
 }
--- a/dlls/ole32/storage.c
+++ b/dlls/ole32/storage.c
@ -19,7 +19,6 @@
 #include "wingdi.h"
 #include "wtypes.h"
 #include "file.h"
-#include "ole.h"
 #include "wine/obj_base.h"
 #include "wine/obj_storage.h"
 #include "heap.h"
@ -1648,7 +1647,7 @@ HRESULT WINAPI
 StgIsStorageFile(LPCOLESTR fn) 
 {
 	LPOLESTR16	xfn = HEAP_strdupWtoA(GetProcessHeap(),0,fn);
-	OLESTATUS	ret = StgIsStorageFile16(xfn);
+	HRESULT	ret = StgIsStorageFile16(xfn);

 	HeapFree(GetProcessHeap(),0,xfn);
 	return ret;
--- a/dlls/serialui/confdlg.c
+++ b/dlls/serialui/confdlg.c
@ -19,15 +19,12 @@

 #include "winbase.h"
 #include "winreg.h"
-#include "dialog.h"
-#include "win.h"
+#include "wingdi.h"
+#include "winuser.h"
 #include "debugtools.h"
 #include "serialui.h"
 #include "winerror.h"

-#include "queue.h"
-#include "message.h"
-
 DEFAULT_DEBUG_CHANNEL(comm);

 HMODULE SERIALUI_hModule = 0;
--- a/dlls/shell32/brsfolder.c
+++ b/dlls/shell32/brsfolder.c
@ -4,7 +4,6 @@
 #include "winerror.h"
 #include "heap.h"
 #include "dlgs.h"
-#include "win.h"
 #include "debugtools.h"
 #include "winreg.h"
 #include "winnls.h"
--- a/dlls/user/ddeml.c
+++ b/dlls/user/ddeml.c
@ -18,10 +18,9 @@
 #include "winerror.h"
 #include "heap.h"
 #include "debugtools.h"
-#include "tchar.h"
 #include "winnt.h"

-DEFAULT_DEBUG_CHANNEL(ddeml)
+DEFAULT_DEBUG_CHANNEL(ddeml);

 /* Has defined in atom.c file.
 */
--- a/dlls/wininet/http.c
+++ b/dlls/wininet/http.c
@ -14,7 +14,6 @@
 #include "debugtools.h"
 #include "winerror.h"
 #include "heap.h"
-#include "tchar.h"
 #include "winsock.h"

 #include <sys/types.h>
@ -970,35 +969,35 @@ INT HTTP_GetStdHeaderIndex(LPCSTR lpszField)
 {
    INT index = -1;

-    if (!_stricmp(lpszField, "Content-Length"))
+    if (!strcasecmp(lpszField, "Content-Length"))
        index = HTTP_QUERY_CONTENT_LENGTH;
-    else if (!_stricmp(lpszField,"Status"))
+    else if (!strcasecmp(lpszField,"Status"))
        index = HTTP_QUERY_STATUS_CODE;
-    else if (!_stricmp(lpszField,"Content-Type"))
+    else if (!strcasecmp(lpszField,"Content-Type"))
        index = HTTP_QUERY_CONTENT_TYPE;
-    else if (!_stricmp(lpszField,"Last-Modified"))
+    else if (!strcasecmp(lpszField,"Last-Modified"))
        index = HTTP_QUERY_LAST_MODIFIED;
-    else if (!_stricmp(lpszField,"Location"))
+    else if (!strcasecmp(lpszField,"Location"))
        index = HTTP_QUERY_LOCATION;
-    else if (!_stricmp(lpszField,"Accept"))
+    else if (!strcasecmp(lpszField,"Accept"))
        index = HTTP_QUERY_ACCEPT;
-    else if (!_stricmp(lpszField,"Referer"))
+    else if (!strcasecmp(lpszField,"Referer"))
        index = HTTP_QUERY_REFERER;
-    else if (!_stricmp(lpszField,"Content-Transfer-Encoding"))
+    else if (!strcasecmp(lpszField,"Content-Transfer-Encoding"))
        index = HTTP_QUERY_CONTENT_TRANSFER_ENCODING;
-    else if (!_stricmp(lpszField,"Date"))
+    else if (!strcasecmp(lpszField,"Date"))
        index = HTTP_QUERY_DATE;
-    else if (!_stricmp(lpszField,"Server"))
+    else if (!strcasecmp(lpszField,"Server"))
        index = HTTP_QUERY_SERVER;
-    else if (!_stricmp(lpszField,"Connection"))
+    else if (!strcasecmp(lpszField,"Connection"))
        index = HTTP_QUERY_CONNECTION;
-    else if (!_stricmp(lpszField,"ETag"))
+    else if (!strcasecmp(lpszField,"ETag"))
        index = HTTP_QUERY_ETAG;
-    else if (!_stricmp(lpszField,"Accept-Ranges"))
+    else if (!strcasecmp(lpszField,"Accept-Ranges"))
        index = HTTP_QUERY_ACCEPT_RANGES;
-    else if (!_stricmp(lpszField,"Expires"))
+    else if (!strcasecmp(lpszField,"Expires"))
        index = HTTP_QUERY_EXPIRES;
-    else if (!_stricmp(lpszField,"Mime-Version"))
+    else if (!strcasecmp(lpszField,"Mime-Version"))
        index = HTTP_QUERY_MIME_VERSION;
    else
    {
@ -1260,7 +1259,7 @@ INT HTTP_GetCustomHeaderIndex(LPWININETHTTPREQA lpwhr, LPCSTR lpszField)

    for (index = 0; index < lpwhr->nCustHeaders; index++)
    {
-	if (!_stricmp(lpwhr->pCustHeaders[index].lpszField, lpszField))
+	if (!strcasecmp(lpwhr->pCustHeaders[index].lpszField, lpszField))
 	    break;

    }
--- a/dlls/wininet/internet.c
+++ b/dlls/wininet/internet.c
@ -22,7 +22,6 @@
 #include "debugtools.h"
 #include "winerror.h"
 #include "winsock.h"
-#include "tchar.h"
 #include "heap.h"

 #include "internet.h"
@ -919,19 +918,19 @@ INTERNET_SCHEME GetInternetScheme(LPCSTR lpszScheme, INT nMaxCmp)
    if(lpszScheme==NULL)
        return INTERNET_SCHEME_UNKNOWN;

-    if (!_strnicmp("ftp", lpszScheme, nMaxCmp))
+    if (!strncasecmp("ftp", lpszScheme, nMaxCmp))
        return INTERNET_SCHEME_FTP;
-    else if (!_strnicmp("gopher", lpszScheme, nMaxCmp))
+    else if (!strncasecmp("gopher", lpszScheme, nMaxCmp))
        return INTERNET_SCHEME_GOPHER;
-    else if (!_strnicmp("http", lpszScheme, nMaxCmp))
+    else if (!strncasecmp("http", lpszScheme, nMaxCmp))
        return INTERNET_SCHEME_HTTP;
-    else if (!_strnicmp("https", lpszScheme, nMaxCmp))
+    else if (!strncasecmp("https", lpszScheme, nMaxCmp))
        return INTERNET_SCHEME_HTTPS;
-    else if (!_strnicmp("file", lpszScheme, nMaxCmp))
+    else if (!strncasecmp("file", lpszScheme, nMaxCmp))
        return INTERNET_SCHEME_FILE;
-    else if (!_strnicmp("news", lpszScheme, nMaxCmp))
+    else if (!strncasecmp("news", lpszScheme, nMaxCmp))
        return INTERNET_SCHEME_NEWS;
-    else if (!_strnicmp("mailto", lpszScheme, nMaxCmp))
+    else if (!strncasecmp("mailto", lpszScheme, nMaxCmp))
        return INTERNET_SCHEME_MAILTO;
    else
        return INTERNET_SCHEME_UNKNOWN;
--- a/dlls/winsock/async.c
+++ b/dlls/winsock/async.c
@ -84,12 +84,11 @@
 #include "winnt.h"
 #include "heap.h"
 #include "task.h"
-#include "message.h"
-#include "miscemu.h"
+#include "ldt.h"
 #include "wine/port.h"
 #include "debugtools.h"

-DEFAULT_DEBUG_CHANNEL(winsock)
+DEFAULT_DEBUG_CHANNEL(winsock);

 /* protoptypes of some functions in socket.c
 */
--- a/dlls/winsock/socket.c
+++ b/dlls/winsock/socket.c
@ -83,15 +83,13 @@
 #include "winnt.h"
 #include "heap.h"
 #include "task.h"
-#include "message.h"
-#include "miscemu.h"
 #include "wine/port.h"
 #include "services.h"
 #include "server.h"
 #include "debugtools.h"


-DEFAULT_DEBUG_CHANNEL(winsock)
+DEFAULT_DEBUG_CHANNEL(winsock);

 #define DEBUG_SOCKADDR 0
 #define dump_sockaddr(a) \
--- a/files/change.c
+++ b/files/change.c
@ -16,8 +16,6 @@
 #include <time.h>
 #include "winbase.h"
 #include "winerror.h"
-#include "process.h"
-#include "thread.h"
 #include "heap.h"
 #include "server.h"
 #include "debugtools.h"
--- a/files/dos_fs.c
+++ b/files/dos_fs.c
@ -32,12 +32,11 @@
 #include "msdos.h"
 #include "syslevel.h"
 #include "server.h"
-#include "process.h"
 #include "options.h"
 #include "debugtools.h"

-DEFAULT_DEBUG_CHANNEL(dosfs)
-DECLARE_DEBUG_CHANNEL(file)
+DEFAULT_DEBUG_CHANNEL(dosfs);
+DECLARE_DEBUG_CHANNEL(file);

 /* Define the VFAT ioctl to get both short and long file names */
 /* FIXME: is it possible to get this to work on other systems? */
--- a/graphics/painting.c
+++ b/graphics/painting.c
@ -10,7 +10,6 @@
 #include "dc.h"
 #include "bitmap.h"
 #include "heap.h"
-#include "cache.h"
 #include "region.h"
 #include "path.h"
 #include "debugtools.h"
--- a/include/ntddk.h
+++ b/include/ntddk.h
@ -990,6 +990,7 @@ DWORD WINAPI RtlIntegerToChar(DWORD x1,DWORD x2,DWORD x3,DWORD x4);
 LPVOID WINAPI RtlNormalizeProcessParams(LPVOID x);
 DWORD WINAPI RtlNtStatusToDosError(DWORD error);
 BOOLEAN WINAPI RtlGetNtProductType(LPDWORD type);
+PIMAGE_NT_HEADERS WINAPI RtlImageNtHeader(HMODULE hModule);

 DWORD WINAPI RtlOpenCurrentUser(
 	IN ACCESS_MASK DesiredAccess,
--- a/include/ole.h
+++ b/include/ole.h
@ -273,12 +273,6 @@ OLESTATUS WINAPI OleCreateFromClip16(
 	LPCSTR name, LPOLECLIENT olecli, LHCLIENTDOC hclientdoc, LPCSTR xname,
 	LPOLEOBJECT *lpoleob, UINT16 render, UINT16 clipformat);

-/* com functions */
-void WINAPI CoFreeUnusedLibraries(void);
-HINSTANCE WINAPI CoLoadLibrary(LPOLESTR lpszLibName, BOOL bAutoFree);
-void WINAPI CoFreeUnusedLibraries(void);
-void WINAPI CoFreeAllLibraries(void);
-
 #ifdef __cplusplus
 } /*extern*/
 #endif
--- a/include/wine/obj_base.h
+++ b/include/wine/obj_base.h
@ -707,6 +707,8 @@ LPVOID WINAPI CoTaskMemRealloc(LPVOID ptr, ULONG size);

 HRESULT WINAPI CoCreateGuid(GUID* pguid);

+HINSTANCE WINAPI CoLoadLibrary(LPOLESTR lpszLibName, BOOL bAutoFree);
+
 void WINAPI CoFreeAllLibraries(void);

 void WINAPI CoFreeLibrary(HINSTANCE hLibrary);
--- a/misc/comm.c
+++ b/misc/comm.c
@ -63,7 +63,6 @@
 #include "options.h"

 #include "server.h"
-#include "process.h"
 #include "winerror.h"
 #include "services.h"
 #include "callback.h"
--- a/misc/main.c
+++ b/misc/main.c
@ -9,6 +9,7 @@
 #include <locale.h>
 #include <ctype.h>
 #include <stdlib.h>
+#include <stdio.h>
 #include <string.h>
 #include <unistd.h>
 #ifdef MALLOC_DEBUGGING
@ -18,17 +19,12 @@
 #include "winbase.h"
 #include "winsock.h"
 #include "heap.h"
-#include "message.h"
 #include "msdos.h"
-#include "color.h"
 #include "options.h"
 #include "debugtools.h"
 #include "debugdefs.h"
 #include "module.h"
-#include "version.h"
 #include "winnls.h"
-#include "console.h"
-#include "gdi.h"
 #include "user.h"
 #include "windef.h"
 #include "wingdi.h"
--- a/msdos/int09.c
+++ b/msdos/int09.c
@ -8,11 +8,10 @@
 #include "wingdi.h"
 #include "winuser.h"
 #include "miscemu.h"
-#include "input.h"
 #include "debugtools.h"
 #include "dosexe.h"

-DEFAULT_DEBUG_CHANNEL(int)
+DEFAULT_DEBUG_CHANNEL(int);

 #define QUEUELEN 31

--- a/objects/bitmap.c
+++ b/objects/bitmap.c
@ -14,7 +14,6 @@
 #include "bitmap.h"
 #include "heap.h"
 #include "global.h"
-#include "cursoricon.h"
 #include "debugtools.h"
 #include "wine/winuser16.h"

--- a/programs/notepad/search.c
+++ b/programs/notepad/search.c
@ -10,7 +10,7 @@
 *
 */

- #include <win.h>
+#include <windows.h>
 
 #define CHARSETSIZE 255
  
--- a/scheduler/synchro.c
+++ b/scheduler/synchro.c
@ -9,11 +9,9 @@
 #include <sys/time.h>
 #include <unistd.h>
 #include "heap.h"
-#include "process.h"
 #include "thread.h"
 #include "winerror.h"
 #include "syslevel.h"
-#include "message.h"
 #include "server.h"

 /***********************************************************************
--- a/windows/caret.c
+++ b/windows/caret.c
@ -6,15 +6,15 @@
 */

 #include "windef.h"
+#include "winbase.h"
 #include "wingdi.h"
+#include "winuser.h"
 #include "wine/wingdi16.h"
 #include "wine/winuser16.h"
-#include "module.h"
 #include "win.h"
-#include "winuser.h"
 #include "debugtools.h"

-DEFAULT_DEBUG_CHANNEL(caret)
+DEFAULT_DEBUG_CHANNEL(caret);

 typedef struct
 {
--- a/windows/cursoricon.c
+++ b/windows/cursoricon.c
@ -37,7 +37,7 @@
 #include "wine/winbase16.h"
 #include "wine/winuser16.h"
 #include "heap.h"
-#include "color.h"
+#include "palette.h"
 #include "bitmap.h"
 #include "cursoricon.h"
 #include "global.h"
--- a/windows/queue.c
+++ b/windows/queue.c
@ -11,7 +11,6 @@
 #include "winerror.h"
 #include "wine/winbase16.h"
 #include "wine/winuser16.h"
-#include "miscemu.h"
 #include "syslevel.h"
 #include "module.h"
 #include "queue.h"
--- a/windows/x11drv/wnd.c
+++ b/windows/x11drv/wnd.c
@ -18,7 +18,6 @@
 #include <string.h>

 #include "bitmap.h"
-#include "color.h"
 #include "debugtools.h"
 #include "dce.h"
 #include "dc.h"