Removed some unnecessary includes.

debugger/msc.c

@@ -24,7 +24,6 @@
 #define PATH_MAX _MAX_PATH
 #endif
 #include "debugger.h"
-#include "neexe.h"
 #include "file.h"
 
 typedef struct

dlls/comctl32/animate.c

@@ -19,7 +19,6 @@
 #include "commctrl.h"
 #include "vfw.h"
 #include "mmsystem.h"
-#include "services.h"
 #include "debugtools.h"
 
 DEFAULT_DEBUG_CHANNEL(animate);

dlls/comctl32/rebar.c

@@ -41,7 +41,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "class.h"
 #include "winbase.h"
 #include "wingdi.h"
 #include "wine/unicode.h"

dlls/commdlg/colordlg.c

@@ -21,9 +21,7 @@
 #include "ldt.h"
 #include "heap.h"
 #include "commdlg.h"
-#include "dialog.h"
 #include "dlgs.h"
-#include "module.h"
 #include "debugtools.h"
 #include "cderr.h"
 

dlls/commdlg/filedlg.c

@@ -18,7 +18,6 @@
 #include "ldt.h"
 #include "heap.h"
 #include "commdlg.h"
-#include "module.h"
 #include "debugtools.h"
 #include "cderr.h"
 

dlls/commdlg/filedlg95.c

@@ -48,7 +48,6 @@
 #include "cdlg.h"
 #include "debugtools.h"
 #include "cderr.h"
-#include "tweak.h"
 #include "shellapi.h"
 #include "shlguid.h"
 #include "filedlgbrowser.h"

dlls/commdlg/finddlg.c

@@ -13,7 +13,6 @@
 #include "wine/winuser16.h"
 #include "commdlg.h"
 #include "ldt.h"
-#include "module.h"
 #include "debugtools.h"
 #include "cderr.h"
 

dlls/commdlg/fontdlg.c

@@ -19,7 +19,6 @@
 #include "heap.h"
 #include "commdlg.h"
 #include "dlgs.h"
-#include "module.h"
 #include "debugtools.h"
 #include "cderr.h"
 

dlls/commdlg/printdlg.c

@@ -19,7 +19,6 @@
 #include "ldt.h"
 #include "commdlg.h"
 #include "dlgs.h"
-#include "module.h"
 #include "debugtools.h"
 #include "cderr.h"
 #include "winspool.h"

dlls/crtdll/time.c

@@ -12,7 +12,6 @@
 
 #include "crtdll.h"
 #include "process.h"
-#include "options.h"
 #include <stdlib.h>
 #include <sys/times.h>
 

dlls/ole32/ifs.c

@@ -13,7 +13,6 @@
 #include "heap.h"
 #include "wine/winbase16.h"
 #include "wine/obj_base.h"
-#include "module.h"
 #include "debugtools.h"
 
 #include "ole.h"

dlls/ole32/ole2nls.c

@@ -15,13 +15,11 @@
 #include "winuser.h"
 #include "wine/windef16.h"
 #include "heap.h"
-#include "options.h"
 #include "winver.h"
 #include "winnls.h"
 #include "winreg.h"
 #include "winerror.h"
 #include "debugtools.h"
-#include "main.h"
 
 DEFAULT_DEBUG_CHANNEL(ole);
 

dlls/ole32/storage.c

@@ -21,7 +21,6 @@
 #include "wine/obj_base.h"
 #include "wine/obj_storage.h"
 #include "heap.h"
-#include "module.h"
 #include "ldt.h"
 #include "debugtools.h"
 

dlls/shell32/shellpath.c

@@ -13,7 +13,6 @@
 
 #include "shlobj.h"
 #include "shell32_main.h"
-#include "options.h"
 #include "wine/undocshell.h"
 #include "wine/unicode.h"
 #include "shlwapi.h"

dlls/user/exticon.c

@@ -14,9 +14,8 @@
 #include "winerror.h"
 #include "wingdi.h"
 #include "winuser.h"
-#include "neexe.h"
+#include "wine/winbase16.h"
 #include "cursoricon.h"
-#include "module.h"
 #include "heap.h"
 #include "debugtools.h"
 

dlls/user/mouse.c

@@ -10,7 +10,6 @@
 #include "debugtools.h"
 #include "callback.h"
 #include "builtin16.h"
-#include "module.h"
 #include "mouse.h"
 #include "windef.h"
 #include "wingdi.h"

dlls/version/resource.c

@@ -12,11 +12,10 @@
 #include <unistd.h>
 
 #include "winbase.h"
+#include "wine/winbase16.h"
 #include "winnls.h"
 #include "wine/unicode.h"
 
-#include "neexe.h"
-#include "module.h"
 #include "winver.h"
 #include "lzexpand.h"
 #include "debugtools.h"

dlls/winmm/lolvldrv.c

@@ -13,7 +13,6 @@
 #include "user.h"	/* should be removed asap; used in MMDRV_(Get|Alloc|Free) */
 #include "selectors.h"
 #include "winver.h"
-#include "module.h"
 #include "winemm.h"
 #include "debugtools.h"
 

dlls/winmm/mmsystem.c

@@ -27,7 +27,6 @@
 #include "heap.h"
 #include "winemm.h"
 #include "selectors.h"
-#include "module.h"
 #include "debugtools.h"
 #include "ntddk.h"
 

graphics/win16drv/font.c

@@ -9,7 +9,6 @@
 #include "winnls.h"
 #include "wine/winbase16.h"
 #include "win16drv.h"
-#include "module.h"
 #include "font.h"
 #include "heap.h"
 #include "gdi.h"
@@ -190,7 +189,7 @@ BOOL	WIN16DRV_EnumDeviceFonts( HDC hdc, LPLOGFONT16 plf,
     WEPFC wepfc;
     DC *dc;
     /* EnumDFontCallback is GDI.158 */
-    FARPROC16 pfnCallback = NE_GetEntryPoint( GetModuleHandle16("GDI"), 158 );
+    FARPROC16 pfnCallback = GetProcAddress16( GetModuleHandle16("GDI"), (LPCSTR)158 );
 
     if (!(dc = DC_GetDCPtr( hdc ))) return 0;
     physDev = (WIN16DRV_PDEVICE *)dc->physDev;

if1632/thunk.c

@@ -11,7 +11,6 @@
 #include "builtin16.h"
 #include "heap.h"
 #include "module.h"
-#include "neexe.h"
 #include "stackframe.h"
 #include "selectors.h"
 #include "debugtools.h"

loader/dos/module.c

@@ -22,7 +22,6 @@
 #include "wine/winbase16.h"
 #include "winerror.h"
 #include "module.h"
-#include "neexe.h"
 #include "task.h"
 #include "selectors.h"
 #include "file.h"

loader/elf.c

@@ -18,7 +18,6 @@
 
 #include "snoop.h"
 #include "process.h"
-#include "neexe.h"
 #include "heap.h"
 #include "module.h"
 #include "debugtools.h"

loader/elfdll.c

@@ -13,7 +13,6 @@
 #include "global.h"
 #include "process.h"
 #include "module.h"
-#include "neexe.h"
 #include "heap.h"
 #include "wine/winbase16.h"
 #include "elfdll.h"

loader/module.c

@@ -14,7 +14,6 @@
 #include "wine/winbase16.h"
 #include "winerror.h"
 #include "heap.h"
-#include "neexe.h"
 #include "process.h"
 #include "selectors.h"
 #include "debugtools.h"

loader/ne/resource.c

@@ -18,7 +18,6 @@
 #include "global.h"
 #include "ldt.h"
 #include "module.h"
-#include "neexe.h"
 #include "callback.h"
 #include "debugtools.h"
 

loader/pe_image.c

@@ -31,7 +31,6 @@
 #endif
 #include "wine/winbase16.h"
 #include "winerror.h"
-#include "neexe.h"
 #include "process.h"
 #include "snoop.h"
 #include "server.h"

loader/pe_resource.c

@@ -22,7 +22,6 @@
 #include "task.h"
 #include "process.h"
 #include "stackframe.h"
-#include "neexe.h"
 #include "debugtools.h"
 
 DEFAULT_DEBUG_CHANNEL(resource);

loader/resource.c

@@ -21,7 +21,6 @@
 #include "heap.h"
 #include "callback.h"
 #include "cursoricon.h"
-#include "neexe.h"
 #include "task.h"
 #include "process.h"
 #include "module.h"

loader/task.c

@@ -18,7 +18,6 @@
 #include "instance.h"
 #include "miscemu.h"
 #include "module.h"
-#include "neexe.h"
 #include "process.h"
 #include "queue.h"
 #include "selectors.h"
@@ -274,8 +273,8 @@ BOOL TASK_Create( NE_MODULE *pModule, UINT16 cmdShow, TEB *teb, LPCSTR cmdline,
 
     pTask->pdb.int20 = 0x20cd;
     pTask->pdb.dispatcher[0] = 0x9a;  /* ljmp */
-    PUT_DWORD(&pTask->pdb.dispatcher[1], (DWORD)NE_GetEntryPoint(
-           GetModuleHandle16("KERNEL"), 102 ));  /* KERNEL.102 is DOS3Call() */
+    PUT_DWORD(&pTask->pdb.dispatcher[1], (DWORD)GetProcAddress16( GetModuleHandle16("KERNEL"),
+                                                                  "DOS3Call" ));
     pTask->pdb.savedint22 = INT_GetPMHandler( 0x22 );
     pTask->pdb.savedint23 = INT_GetPMHandler( 0x23 );
     pTask->pdb.savedint24 = INT_GetPMHandler( 0x24 );

misc/version.c

@@ -18,7 +18,6 @@
 #include "process.h"
 #include "options.h"
 #include "debugtools.h"
-#include "neexe.h"
 #include "winerror.h"
 
 DEFAULT_DEBUG_CHANNEL(ver);

msdos/dpmi.c

@@ -785,8 +785,8 @@ void WINAPI INT_Int31Handler( CONTEXT86 *context )
                 break;
             }
             if (entryPoint) 
-                context->Eax = LOWORD(NE_GetEntryPoint( GetModuleHandle16( "KERNEL" ),
-                                                            entryPoint ));
+                context->Eax = LOWORD(GetProcAddress16( GetModuleHandle16( "KERNEL" ),
+                                                        (LPCSTR)(ULONG_PTR)entryPoint ));
         }
         break;
 

msdos/vxd.c

@@ -17,7 +17,6 @@
 #include "msdos.h"
 #include "miscemu.h"
 #include "selectors.h"
-#include "neexe.h"
 #include "task.h"
 #include "process.h"
 #include "file.h"

relay32/builtin32.c

@@ -22,7 +22,6 @@
 #include "wine/winbase16.h"
 #include "wine/library.h"
 #include "global.h"
-#include "neexe.h"
 #include "module.h"
 #include "heap.h"
 #include "main.h"

relay32/snoop.c

@@ -13,7 +13,6 @@
 #include "winnt.h"
 #include "heap.h"
 #include "snoop.h"
-#include "neexe.h"
 #include "selectors.h"
 #include "stackframe.h"
 #include "debugtools.h"

scheduler/process.c

@@ -19,7 +19,6 @@
 #include "drive.h"
 #include "main.h"
 #include "module.h"
-#include "neexe.h"
 #include "file.h"
 #include "global.h"
 #include "heap.h"

tools/cvdump/cvdump.h

@@ -6,7 +6,6 @@
 
 /* #define VERBOSE */
 
-#include "neexe.h"
 #include "cvinclude.h"
 
 typedef enum { CV_NONE, CV_DOS, CV_NT, CV_DBG } CVHeaderType;

tools/fnt2bdf.c

@@ -21,7 +21,6 @@
 #include <fcntl.h>
 
 #include "fnt2bdf.h"
-#include "neexe.h"
 #include "module.h"
 
 #define FILE_ERROR	0

tools/winebuild/spec16.c

@@ -15,7 +15,6 @@
 #include "wine/exception.h"
 #include "builtin16.h"
 #include "module.h"
-#include "neexe.h"
 #include "stackframe.h"
 
 #include "build.h"

windows/dce.c

@@ -26,7 +26,6 @@
 #include "region.h"
 #include "heap.h"
 #include "local.h"
-#include "module.h"
 #include "user.h"
 #include "debugtools.h"
 #include "windef.h"
@@ -90,7 +89,7 @@ DCE *DCE_AllocDCE( HWND hWnd, DCE_TYPE type )
     
     /* store DCE handle in DC hook data field */
 
-    hookProc = (FARPROC16)NE_GetEntryPoint( GetModuleHandle16("USER"), 362 );
+    hookProc = GetProcAddress16( GetModuleHandle16("USER"), (LPCSTR)362 );
     SetDCHook( dce->hDC, hookProc, (DWORD)dce );
 
     dce->hwndCurrent = hWnd;

windows/driver.c

@@ -15,7 +15,6 @@
 #include "wingdi.h"
 #include "winuser.h"
 #include "ldt.h"
-#include "module.h"
 #include "mmddk.h"
 #include "debugtools.h"
 

windows/input.c

@@ -29,7 +29,6 @@
 #include "mouse.h"
 #include "message.h"
 #include "queue.h"
-#include "module.h"
 #include "debugtools.h"
 #include "winerror.h"
 #include "task.h"
@@ -296,7 +295,7 @@ void WINAPI WIN16_mouse_event( CONTEXT86 *context )
 FARPROC16 WINAPI GetMouseEventProc16(void)
 {
     HMODULE16 hmodule = GetModuleHandle16("USER");
-    return NE_GetEntryPoint( hmodule, NE_GetOrdinal( hmodule, "mouse_event" ));
+    return GetProcAddress16( hmodule, "mouse_event" );
 }
 
 

windows/queue.c

@@ -11,7 +11,6 @@
 #include "winerror.h"
 #include "wine/winbase16.h"
 #include "wine/winuser16.h"
-#include "module.h"
 #include "queue.h"
 #include "task.h"
 #include "win.h"

windows/spy.c

@@ -13,7 +13,6 @@
 #include "wine/winuser16.h"
 #include "wine/winbase16.h"
 #include "win.h"
-#include "module.h"
 #include "options.h"
 #include "debugtools.h"
 #include "spy.h"

windows/user.c

@@ -22,7 +22,6 @@
 #include "hook.h"
 #include "toolhelp.h"
 #include "message.h"
-#include "module.h"
 #include "miscemu.h"
 #include "sysmetrics.h"
 #include "callback.h"

windows/winpos.c

@@ -12,7 +12,6 @@
 #include "winerror.h"
 #include "wine/winuser16.h"
 #include "heap.h"
-#include "module.h"
 #include "user.h"
 #include "region.h"
 #include "win.h"