Removed include/selectors.h.

dlls/kernel/global16.c

@@ -41,9 +41,9 @@
 #include "ntstatus.h"
 #include "global.h"
 #include "toolhelp.h"
-#include "selectors.h"
 #include "miscemu.h"
 #include "stackframe.h"
+#include "kernel_private.h"
 #include "wine/debug.h"
 #include "winerror.h"
 

dlls/kernel/instr.c

@@ -28,7 +28,6 @@
 #include "excpt.h"
 #include "module.h"
 #include "miscemu.h"
-#include "selectors.h"
 #include "wine/debug.h"
 #include "kernel_private.h"
 #include "thread.h"

dlls/kernel/kernel_private.h

@@ -56,6 +56,12 @@ extern VOID SYSLEVEL_CheckNotLevel( INT level );
 extern DWORD INSTR_EmulateInstruction( EXCEPTION_RECORD *rec, CONTEXT86 *context );
 extern void INSTR_CallBuiltinHandler( CONTEXT86 *context, BYTE intnum );
 
+extern WORD SELECTOR_AllocBlock( const void *base, DWORD size, unsigned char flags );
+extern WORD SELECTOR_ReallocBlock( WORD sel, const void *base, DWORD size );
+extern void SELECTOR_FreeBlock( WORD sel );
+#define IS_SELECTOR_32BIT(sel) \
+   (wine_ldt_is_system(sel) || (wine_ldt_copy.flags[LOWORD(sel) >> 3] & WINE_LDT_FLAGS_32BIT))
+
 /* this structure is always located at offset 0 of the DGROUP segment */
 #include "pshpack1.h"
 typedef struct

dlls/kernel/local16.c

@@ -39,7 +39,6 @@
 #include "global.h"
 #include "module.h"
 #include "stackframe.h"
-#include "selectors.h"
 #include "toolhelp.h"
 #include "kernel_private.h"
 #include "wine/debug.h"

dlls/kernel/selector.c

@@ -26,9 +26,9 @@
 #include "winerror.h"
 #include "wine/winbase16.h"
 #include "miscemu.h"
-#include "selectors.h"
 #include "wine/server.h"
 #include "wine/debug.h"
+#include "kernel_private.h"
 #include "toolhelp.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(selector);

dlls/kernel/thunk.c

@@ -42,9 +42,9 @@
 #include "wine/library.h"
 #include "flatthunk.h"
 #include "module.h"
-#include "selectors.h"
 #include "stackframe.h"
 #include "task.h"
+#include "kernel_private.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(thunk);
 

dlls/kernel/wowthunk.c

@@ -35,7 +35,6 @@
 #include "file.h"
 #include "task.h"
 #include "miscemu.h"
-#include "selectors.h"
 #include "stackframe.h"
 #include "kernel_private.h"
 #include "wine/exception.h"

include/selectors.h

@@ -1,34 +0,0 @@
-/*
- * Selector definitions
- *
- * 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_SELECTORS_H
-#define __WINE_SELECTORS_H
-
-#include <windef.h>
-#include <wine/library.h>
-
-extern WORD SELECTOR_AllocBlock( const void *base, DWORD size, unsigned char flags );
-extern WORD SELECTOR_ReallocBlock( WORD sel, const void *base, DWORD size );
-extern void SELECTOR_FreeBlock( WORD sel );
-
-#define IS_SELECTOR_32BIT(sel) \
-   (wine_ldt_is_system(sel) || (wine_ldt_copy.flags[LOWORD(sel) >> 3] & WINE_LDT_FLAGS_32BIT))
-
-#endif /* __WINE_SELECTORS_H */