Removed some unnecessary includes.

include/loadorder.h

diff --git a/include/loadorder.h b/include/loadorder.h
deleted file mode 100644
index 2b0c738..0000000
--- a/include/loadorder.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Module/Library loadorder
- *
- * Copyright 1999 Bertho Stultiens
- */
-
-#ifndef __WINE_LOADORDER_H
-#define __WINE_LOADORDER_H
-
-#include "windef.h"
-
-enum loadorder_type
-{
-    LOADORDER_INVALID = 0, /* Must be 0 */
-    LOADORDER_DLL,         /* Native DLLs */
-    LOADORDER_SO,          /* Native .so libraries */
-    LOADORDER_BI,          /* Built-in modules */
-    LOADORDER_NTYPES
-};
-
-extern void MODULE_InitLoadOrder(void);
-extern void MODULE_GetLoadOrder( enum loadorder_type plo[], const char *path, BOOL win32 );
-extern void MODULE_AddLoadOrderOption( const char *option );
-
-#endif
-

include/metafile.h

diff --git a/include/metafile.h b/include/metafile.h
index 9e3c7ff..7b4d6a6 100644
--- a/include/metafile.h
+++ b/include/metafile.h
@@ -18,19 +18,8 @@
     METAHEADER  *mh;
 } METAFILEOBJ;
 
-#include "pshpack1.h"
-typedef struct {
-    DWORD dw1, dw2, dw3;
-    WORD w4;
-    CHAR filename[0x100];
-} METAHEADERDISK;
-#include "poppack.h"
-
-#define MFHEADERSIZE (sizeof(METAHEADER))
-#define MFVERSION 0x300
 #define META_EOF 0x0000
 
-
 /* values of mtType in METAHEADER.  Note however that the disk image of a disk
    based metafile has mtType == 1 */
 #define METAFILE_MEMORY 1

include/module.h

diff --git a/include/module.h b/include/module.h
index 3dcf97e..006a8b3 100644
--- a/include/module.h
+++ b/include/module.h
@@ -161,6 +161,15 @@
     ((IMAGE_SECTION_HEADER*)((LPBYTE)&PE_HEADER(module)->OptionalHeader + \
                            PE_HEADER(module)->FileHeader.SizeOfOptionalHeader))
 
+enum loadorder_type
+{
+    LOADORDER_INVALID = 0, /* Must be 0 */
+    LOADORDER_DLL,         /* Native DLLs */
+    LOADORDER_SO,          /* Native .so libraries */
+    LOADORDER_BI,          /* Built-in modules */
+    LOADORDER_NTYPES
+};
+
 /* module.c */
 extern WINE_MODREF *MODULE_AllocModRef( HMODULE hModule, LPCSTR filename );
 extern FARPROC MODULE_GetProcAddress( HMODULE hModule, LPCSTR function, BOOL snoop );
@@ -224,6 +233,11 @@
 extern void PE_InitTls(void);
 extern BOOL PE_InitDLL( HMODULE module, DWORD type, LPVOID lpReserved );
 
+/* loader/loadorder.c */
+extern void MODULE_InitLoadOrder(void);
+extern void MODULE_GetLoadOrder( enum loadorder_type plo[], const char *path, BOOL win32 );
+extern void MODULE_AddLoadOrderOption( const char *option );
+
 /* loader/elf.c */
 extern WINE_MODREF *ELF_LoadLibraryExA( LPCSTR libname, DWORD flags);
 

include/options.h

diff --git a/include/options.h b/include/options.h
index d2a3db6..00f6a45 100644
--- a/include/options.h
+++ b/include/options.h
@@ -38,9 +38,4 @@
 extern void VERSION_ParseWinVersion( const char *arg );
 extern void VERSION_ParseDosVersion( const char *arg );
 
-#define IS_OPTION_TRUE(ch) \
-    ((ch) == 'y' || (ch) == 'Y' || (ch) == 't' || (ch) == 'T' || (ch) == '1')
-#define IS_OPTION_FALSE(ch) \
-    ((ch) == 'n' || (ch) == 'N' || (ch) == 'f' || (ch) == 'F' || (ch) == '0')
-
 #endif  /* __WINE_OPTIONS_H */