diff --git a/debugger/msc.c b/debugger/msc.c
index 8cb59d895d4..97719a6591a 100644
--- a/debugger/msc.c
+++ b/debugger/msc.c
@@ -24,7 +24,6 @@
 #define PATH_MAX _MAX_PATH
 #endif
 #include "debugger.h"
-#include "neexe.h"
 #include "file.h"
 
 typedef struct
diff --git a/dlls/comctl32/animate.c b/dlls/comctl32/animate.c
index 07e599ffbdf..94c440f1db8 100644
--- a/dlls/comctl32/animate.c
+++ b/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);
diff --git a/dlls/comctl32/rebar.c b/dlls/comctl32/rebar.c
index eabc5ebfce4..1c4110b00f2 100644
--- a/dlls/comctl32/rebar.c
+++ b/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"
diff --git a/dlls/commdlg/colordlg.c b/dlls/commdlg/colordlg.c
index 90cc2f583c7..d2eaf213ec4 100644
--- a/dlls/commdlg/colordlg.c
+++ b/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"
 
diff --git a/dlls/commdlg/filedlg.c b/dlls/commdlg/filedlg.c
index 65e8a1cb76d..dec53eb314a 100644
--- a/dlls/commdlg/filedlg.c
+++ b/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"
 
diff --git a/dlls/commdlg/filedlg95.c b/dlls/commdlg/filedlg95.c
index 1a782532109..06290d39612 100644
--- a/dlls/commdlg/filedlg95.c
+++ b/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"
diff --git a/dlls/commdlg/finddlg.c b/dlls/commdlg/finddlg.c
index 4fe7e40bdd5..e2fc9789b96 100644
--- a/dlls/commdlg/finddlg.c
+++ b/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"
 
diff --git a/dlls/commdlg/fontdlg.c b/dlls/commdlg/fontdlg.c
index 7f470604354..d06695ff915 100644
--- a/dlls/commdlg/fontdlg.c
+++ b/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"
 
diff --git a/dlls/commdlg/printdlg.c b/dlls/commdlg/printdlg.c
index 3bfc5143b2a..0d2e03aa03a 100644
--- a/dlls/commdlg/printdlg.c
+++ b/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"
diff --git a/dlls/crtdll/time.c b/dlls/crtdll/time.c
index cc2b026c738..671288ba1fd 100644
--- a/dlls/crtdll/time.c
+++ b/dlls/crtdll/time.c
@@ -12,7 +12,6 @@
 
 #include "crtdll.h"
 #include "process.h"
-#include "options.h"
 #include <stdlib.h>
 #include <sys/times.h>
 
diff --git a/dlls/ole32/ifs.c b/dlls/ole32/ifs.c
index 7e8c4beb42a..d6fa4e4e3c9 100644
--- a/dlls/ole32/ifs.c
+++ b/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"
diff --git a/dlls/ole32/ole2nls.c b/dlls/ole32/ole2nls.c
index 45772b664c7..a2040d38824 100644
--- a/dlls/ole32/ole2nls.c
+++ b/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);
 
diff --git a/dlls/ole32/storage.c b/dlls/ole32/storage.c
index e576182f389..3b6aab50424 100644
--- a/dlls/ole32/storage.c
+++ b/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"
 
diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c
index 4541349f5a6..15c55bfbf23 100644
--- a/dlls/shell32/shellpath.c
+++ b/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"
diff --git a/dlls/user/exticon.c b/dlls/user/exticon.c
index 00f66e82428..b8de6cc0b36 100644
--- a/dlls/user/exticon.c
+++ b/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"
 
diff --git a/dlls/user/mouse.c b/dlls/user/mouse.c
index c7b2b241ff6..b65a25da728 100644
--- a/dlls/user/mouse.c
+++ b/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"
diff --git a/dlls/version/resource.c b/dlls/version/resource.c
index 48203b48668..9fb6d1e865c 100644
--- a/dlls/version/resource.c
+++ b/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"
diff --git a/dlls/winmm/lolvldrv.c b/dlls/winmm/lolvldrv.c
index 41fbbb812da..f121cf6e1f8 100644
--- a/dlls/winmm/lolvldrv.c
+++ b/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"
 
diff --git a/dlls/winmm/mmsystem.c b/dlls/winmm/mmsystem.c
index 5adc25003d0..41a4a59c6a7 100644
--- a/dlls/winmm/mmsystem.c
+++ b/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"
 
diff --git a/graphics/win16drv/font.c b/graphics/win16drv/font.c
index bf595ae6f8a..78eaad9a856 100644
--- a/graphics/win16drv/font.c
+++ b/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;
diff --git a/if1632/thunk.c b/if1632/thunk.c
index 2ef9d4a86a2..34a0d5fa990 100644
--- a/if1632/thunk.c
+++ b/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"
diff --git a/loader/dos/module.c b/loader/dos/module.c
index 015346ba60a..41f1bc3aa00 100644
--- a/loader/dos/module.c
+++ b/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"
diff --git a/loader/elf.c b/loader/elf.c
index aeceecc4776..e733ad672db 100644
--- a/loader/elf.c
+++ b/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"
diff --git a/loader/elfdll.c b/loader/elfdll.c
index db2c7119edb..5398c212ea9 100644
--- a/loader/elfdll.c
+++ b/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"
diff --git a/loader/module.c b/loader/module.c
index 795691e8e35..e845783447b 100644
--- a/loader/module.c
+++ b/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"
diff --git a/loader/ne/resource.c b/loader/ne/resource.c
index ce4970fb94b..f904a107b58 100644
--- a/loader/ne/resource.c
+++ b/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"
 
diff --git a/loader/pe_image.c b/loader/pe_image.c
index 398cd1d7075..666248c0f17 100644
--- a/loader/pe_image.c
+++ b/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"
diff --git a/loader/pe_resource.c b/loader/pe_resource.c
index 296fdb9cea2..bf0823cdf64 100644
--- a/loader/pe_resource.c
+++ b/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);
diff --git a/loader/resource.c b/loader/resource.c
index 20fb27583b6..604838e3202 100644
--- a/loader/resource.c
+++ b/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"
diff --git a/loader/task.c b/loader/task.c
index f8a9852af00..a0193396ae6 100644
--- a/loader/task.c
+++ b/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 );
diff --git a/misc/version.c b/misc/version.c
index 9981a4e0158..d0539b6eb32 100644
--- a/misc/version.c
+++ b/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);
diff --git a/msdos/dpmi.c b/msdos/dpmi.c
index abaefe62a13..2a6de5a59ec 100644
--- a/msdos/dpmi.c
+++ b/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;
 
diff --git a/msdos/vxd.c b/msdos/vxd.c
index 7495420782d..ac9f97f8618 100644
--- a/msdos/vxd.c
+++ b/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"
diff --git a/relay32/builtin32.c b/relay32/builtin32.c
index b2920201043..e16398cac73 100644
--- a/relay32/builtin32.c
+++ b/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"
diff --git a/relay32/snoop.c b/relay32/snoop.c
index ed7a402e6c4..37b978e6ce0 100644
--- a/relay32/snoop.c
+++ b/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"
diff --git a/scheduler/process.c b/scheduler/process.c
index 5f61c8e0a96..f489227aebe 100644
--- a/scheduler/process.c
+++ b/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"
diff --git a/tools/cvdump/cvdump.h b/tools/cvdump/cvdump.h
index 03f19a56c8d..d67b93bc46b 100644
--- a/tools/cvdump/cvdump.h
+++ b/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;
diff --git a/tools/fnt2bdf.c b/tools/fnt2bdf.c
index b0582c877ec..cb854e90043 100644
--- a/tools/fnt2bdf.c
+++ b/tools/fnt2bdf.c
@@ -21,7 +21,6 @@
 #include <fcntl.h>
 
 #include "fnt2bdf.h"
-#include "neexe.h"
 #include "module.h"
 
 #define FILE_ERROR	0
diff --git a/tools/winebuild/spec16.c b/tools/winebuild/spec16.c
index 25637019668..63d5ba1fe11 100644
--- a/tools/winebuild/spec16.c
+++ b/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"
diff --git a/windows/dce.c b/windows/dce.c
index ac95b8a377f..f9b2df52126 100644
--- a/windows/dce.c
+++ b/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;
diff --git a/windows/driver.c b/windows/driver.c
index ba3792b7aa7..2e9401101b4 100644
--- a/windows/driver.c
+++ b/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"
 
diff --git a/windows/input.c b/windows/input.c
index 147c492d966..82225b24d56 100644
--- a/windows/input.c
+++ b/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" );
 }
 
 
diff --git a/windows/queue.c b/windows/queue.c
index 98e655d6c27..9f90f58408b 100644
--- a/windows/queue.c
+++ b/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"
diff --git a/windows/spy.c b/windows/spy.c
index 3f1a27d71e9..7056a2cb4b5 100644
--- a/windows/spy.c
+++ b/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"
diff --git a/windows/user.c b/windows/user.c
index f8d1dff2e35..5c1d8de788f 100644
--- a/windows/user.c
+++ b/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"
diff --git a/windows/winpos.c b/windows/winpos.c
index 3b6a5426805..c080c326074 100644
--- a/windows/winpos.c
+++ b/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"