Move content of global.h into the appropriate private headers.
diff --git a/dlls/kernel/atom.c b/dlls/kernel/atom.c
index 32f86de..3c981ac 100644
--- a/dlls/kernel/atom.c
+++ b/dlls/kernel/atom.c
@@ -41,7 +41,6 @@
#include "wine/server.h"
#include "wine/unicode.h"
#include "wine/winbase16.h"
-#include "global.h"
#include "kernel_private.h"
#include "stackframe.h"
diff --git a/dlls/kernel/console.c b/dlls/kernel/console.c
index 198765d..16d1852 100644
--- a/dlls/kernel/console.c
+++ b/dlls/kernel/console.c
@@ -44,6 +44,7 @@
#include "winnls.h"
#include "winerror.h"
#include "wincon.h"
+#include "wine/winbase16.h"
#include "wine/server.h"
#include "wine/exception.h"
#include "wine/unicode.h"
diff --git a/dlls/kernel/dosmem.c b/dlls/kernel/dosmem.c
index db89db9..69f3586 100644
--- a/dlls/kernel/dosmem.c
+++ b/dlls/kernel/dosmem.c
@@ -40,7 +40,7 @@
#include "winbase.h"
#include "wine/winbase16.h"
-#include "global.h"
+#include "kernel_private.h"
#include "miscemu.h"
#include "wine/debug.h"
diff --git a/dlls/kernel/file.c b/dlls/kernel/file.c
index deae039..6767b94 100644
--- a/dlls/kernel/file.c
+++ b/dlls/kernel/file.c
@@ -37,6 +37,7 @@
#include "winreg.h"
#include "winternl.h"
#include "wincon.h"
+#include "wine/winbase16.h"
#include "kernel_private.h"
#include "wine/unicode.h"
diff --git a/dlls/kernel/global16.c b/dlls/kernel/global16.c
index 8706471..35c4827 100644
--- a/dlls/kernel/global16.c
+++ b/dlls/kernel/global16.c
@@ -39,7 +39,6 @@
#include "wine/winbase16.h"
#include "ntstatus.h"
-#include "global.h"
#include "toolhelp.h"
#include "miscemu.h"
#include "stackframe.h"
diff --git a/dlls/kernel/kernel_main.c b/dlls/kernel/kernel_main.c
index ed384b2..951fe4b 100644
--- a/dlls/kernel/kernel_main.c
+++ b/dlls/kernel/kernel_main.c
@@ -37,7 +37,6 @@
#include "wine/winbase16.h"
#include "wine/library.h"
#include "file.h"
-#include "global.h"
#include "miscemu.h"
#include "module.h"
#include "thread.h"
diff --git a/dlls/kernel/kernel_private.h b/dlls/kernel/kernel_private.h
index 8e63520..d2afc0b 100644
--- a/dlls/kernel/kernel_private.h
+++ b/dlls/kernel/kernel_private.h
@@ -64,6 +64,12 @@
#define IS_SELECTOR_32BIT(sel) \
(wine_ldt_is_system(sel) || (wine_ldt_copy.flags[LOWORD(sel) >> 3] & WINE_LDT_FLAGS_32BIT))
+extern HGLOBAL16 GLOBAL_CreateBlock( UINT16 flags, const void *ptr, DWORD size,
+ HGLOBAL16 hOwner, unsigned char selflags );
+extern BOOL16 GLOBAL_FreeBlock( HGLOBAL16 handle );
+extern BOOL16 GLOBAL_MoveBlock( HGLOBAL16 handle, const void *ptr, DWORD size );
+extern HGLOBAL16 GLOBAL_Alloc( WORD flags, DWORD size, HGLOBAL16 hOwner, unsigned char selflags );
+
/* this structure is always located at offset 0 of the DGROUP segment */
#include "pshpack1.h"
typedef struct
diff --git a/dlls/kernel/local16.c b/dlls/kernel/local16.c
index adee4fd..53e452f 100644
--- a/dlls/kernel/local16.c
+++ b/dlls/kernel/local16.c
@@ -36,7 +36,6 @@
#include "wine/winbase16.h"
#include "wownt32.h"
#include "local.h"
-#include "global.h"
#include "module.h"
#include "stackframe.h"
#include "toolhelp.h"
diff --git a/dlls/kernel/ne_module.c b/dlls/kernel/ne_module.c
index 193ec71..e92d7ab 100644
--- a/dlls/kernel/ne_module.c
+++ b/dlls/kernel/ne_module.c
@@ -41,11 +41,11 @@
#include "wine/library.h"
#include "module.h"
#include "toolhelp.h"
-#include "global.h"
#include "file.h"
#include "builtin16.h"
#include "stackframe.h"
#include "excpt.h"
+#include "kernel_private.h"
#include "wine/unicode.h"
#include "wine/exception.h"
#include "wine/debug.h"
diff --git a/dlls/kernel/ne_segment.c b/dlls/kernel/ne_segment.c
index 2e3a582..89c478f 100644
--- a/dlls/kernel/ne_segment.c
+++ b/dlls/kernel/ne_segment.c
@@ -36,7 +36,7 @@
#include "wine/winbase16.h"
#include "wownt32.h"
#include "wine/library.h"
-#include "global.h"
+#include "kernel_private.h"
#include "file.h"
#include "module.h"
#include "stackframe.h"
diff --git a/dlls/kernel/snoop16.c b/dlls/kernel/snoop16.c
index 38e2953..cd951fd 100644
--- a/dlls/kernel/snoop16.c
+++ b/dlls/kernel/snoop16.c
@@ -30,7 +30,7 @@
#include "winnt.h"
#include "wine/winbase16.h"
#include "wine/library.h"
-#include "global.h"
+#include "kernel_private.h"
#include "module.h"
#include "stackframe.h"
#include "builtin16.h"
diff --git a/dlls/kernel/sync.c b/dlls/kernel/sync.c
index 15722aa..b0ca5ea 100644
--- a/dlls/kernel/sync.c
+++ b/dlls/kernel/sync.c
@@ -43,6 +43,7 @@
#include "wine/server.h"
#include "wine/unicode.h"
+#include "wine/winbase16.h"
#include "kernel_private.h"
#include "file.h"
diff --git a/dlls/kernel/task.c b/dlls/kernel/task.c
index 2616ec0..9b002c3 100644
--- a/dlls/kernel/task.c
+++ b/dlls/kernel/task.c
@@ -39,7 +39,6 @@
#include "wine/winbase16.h"
#include "drive.h"
#include "file.h"
-#include "global.h"
#include "module.h"
#include "winternl.h"
#include "wine/server.h"
diff --git a/dlls/kernel/vxd.c b/dlls/kernel/vxd.c
index c034cd8..de8d01d 100644
--- a/dlls/kernel/vxd.c
+++ b/dlls/kernel/vxd.c
@@ -39,6 +39,7 @@
#include "ntstatus.h"
#include "winnt.h"
#include "winternl.h"
+#include "wine/winbase16.h"
#include "kernel_private.h"
#include "wine/debug.h"
diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h
index 6e012d1..d81cc13 100644
--- a/dlls/ntdll/ntdll_misc.h
+++ b/dlls/ntdll/ntdll_misc.h
@@ -95,4 +95,9 @@
LPVOID lpInBuffer, DWORD nInBufferSize,
LPVOID lpOutBuffer, DWORD nOutBufferSize);
+/* memory/virtual.c */
+typedef BOOL (*HANDLERPROC)(LPVOID, LPCVOID);
+extern BOOL VIRTUAL_SetFaultHandler(LPCVOID addr, HANDLERPROC proc, LPVOID arg);
+extern DWORD VIRTUAL_HandleFault(LPCVOID addr);
+
#endif
diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c
index 5f15a59..187f323 100644
--- a/dlls/ntdll/signal_i386.c
+++ b/dlls/ntdll/signal_i386.c
@@ -405,7 +405,6 @@
#define T_UNKNOWN (-1) /* Unknown fault (TRAP_sig not defined) */
#include "wine/exception.h"
-#include "global.h"
#include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(seh);
diff --git a/dlls/ntdll/signal_powerpc.c b/dlls/ntdll/signal_powerpc.c
index 3806128..a0b6eb0 100644
--- a/dlls/ntdll/signal_powerpc.c
+++ b/dlls/ntdll/signal_powerpc.c
@@ -56,7 +56,6 @@
#include "winternl.h"
#include "wine/library.h"
#include "wine/exception.h"
-#include "global.h"
#include "ntdll_misc.h"
#include "wine/debug.h"
diff --git a/dlls/ntdll/signal_sparc.c b/dlls/ntdll/signal_sparc.c
index fd4affe..cd4f6b0 100644
--- a/dlls/ntdll/signal_sparc.c
+++ b/dlls/ntdll/signal_sparc.c
@@ -38,7 +38,6 @@
#include "winnt.h"
#include "wine/exception.h"
-#include "global.h"
#include "ntdll_misc.h"
#include "wine/debug.h"
diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c
index fec85a0..967d806 100644
--- a/dlls/ntdll/virtual.c
+++ b/dlls/ntdll/virtual.c
@@ -43,7 +43,6 @@
#include "ntstatus.h"
#include "thread.h"
#include "winternl.h"
-#include "global.h"
#include "wine/library.h"
#include "wine/server.h"
#include "wine/debug.h"
diff --git a/dlls/user/user_main.c b/dlls/user/user_main.c
index d8e5262..8e1542a 100644
--- a/dlls/user/user_main.c
+++ b/dlls/user/user_main.c
@@ -30,7 +30,6 @@
#include "controls.h"
#include "cursoricon.h"
-#include "global.h"
#include "message.h"
#include "user.h"
#include "win.h"
diff --git a/dlls/x11drv/dib.c b/dlls/x11drv/dib.c
index 90a86df..487b21d 100644
--- a/dlls/x11drv/dib.c
+++ b/dlls/x11drv/dib.c
@@ -41,7 +41,6 @@
#include "wine/debug.h"
#include "gdi.h"
#include "palette.h"
-#include "global.h"
WINE_DEFAULT_DEBUG_CHANNEL(bitmap);
WINE_DECLARE_DEBUG_CHANNEL(x11drv);
@@ -4611,6 +4610,7 @@
}
else if (bm.bmBits)
{
+ extern BOOL VIRTUAL_SetFaultHandler(LPCVOID addr, BOOL (*proc)(LPVOID, LPCVOID), LPVOID arg);
/* Install fault handler, if possible */
InitializeCriticalSection(&(dib->lock));
if (VIRTUAL_SetFaultHandler(bm.bmBits, X11DRV_DIB_FaultHandler, (LPVOID)res))
diff --git a/include/global.h b/include/global.h
deleted file mode 100644
index 947051a..0000000
--- a/include/global.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Global heap declarations
- *
- * Copyright 1995 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_GLOBAL_H
-#define __WINE_GLOBAL_H
-
-#include <windef.h>
-#include <wine/windef16.h>
-#include <wine/library.h>
-
-/* memory/global.c */
-extern HGLOBAL16 GLOBAL_CreateBlock( UINT16 flags, const void *ptr, DWORD size,
- HGLOBAL16 hOwner, unsigned char selflags );
-extern BOOL16 GLOBAL_FreeBlock( HGLOBAL16 handle );
-extern BOOL16 GLOBAL_MoveBlock( HGLOBAL16 handle, const void *ptr, DWORD size );
-extern HGLOBAL16 GLOBAL_Alloc( WORD flags, DWORD size, HGLOBAL16 hOwner, unsigned char selflags );
-
-/* memory/virtual.c */
-typedef BOOL (*HANDLERPROC)(LPVOID, LPCVOID);
-extern BOOL VIRTUAL_SetFaultHandler(LPCVOID addr, HANDLERPROC proc, LPVOID arg);
-extern DWORD VIRTUAL_HandleFault(LPCVOID addr);
-
-#endif /* __WINE_GLOBAL_H */
diff --git a/objects/metafile.c b/objects/metafile.c
index 5ed4e20..d61f9d8 100644
--- a/objects/metafile.c
+++ b/objects/metafile.c
@@ -51,7 +51,6 @@
#include "wine/winbase16.h"
#include "wine/wingdi16.h"
#include "bitmap.h"
-#include "global.h"
#include "wownt32.h"
#include "wine/debug.h"
