Moved a few non-standard headers into their respective dlls.

diff --git a/debugger/winedbg.c b/debugger/winedbg.c
index 9cc3a6e..b8c9d0a 100644
--- a/debugger/winedbg.c
+++ b/debugger/winedbg.c

@@ -12,7 +12,6 @@
 #include "debugger.h"
 
 #include "thread.h"
-#include "process.h"
 #include "file.h"
 #include "wincon.h"
 #include "wingdi.h"

diff --git a/include/crtdll.h b/dlls/crtdll/crtdll.h
similarity index 100%
rename from include/crtdll.h
rename to dlls/crtdll/crtdll.h


diff --git a/dlls/ddraw/dga.c b/dlls/ddraw/dga.c
index 511d66a..b298b3a 100644
--- a/dlls/ddraw/dga.c
+++ b/dlls/ddraw/dga.c

@@ -34,7 +34,6 @@
 #include "ddraw.h"
 #include "d3d.h"
 #include "debugtools.h"
-#include "spy.h"
 #include "message.h"
 #include "options.h"
 

diff --git a/dlls/ddraw/dga2.c b/dlls/ddraw/dga2.c
index f72a4ca..653a0c3 100644
--- a/dlls/ddraw/dga2.c
+++ b/dlls/ddraw/dga2.c

@@ -23,7 +23,6 @@
 #include "ddraw.h"
 #include "d3d.h"
 #include "debugtools.h"
-#include "spy.h"
 #include "message.h"
 #include "options.h"
 

diff --git a/dlls/ddraw/helper.c b/dlls/ddraw/helper.c
index 6a30124..b7091c2 100644
--- a/dlls/ddraw/helper.c
+++ b/dlls/ddraw/helper.c

@@ -23,7 +23,6 @@
 #include "ddraw.h"
 #include "d3d.h"
 #include "debugtools.h"
-#include "spy.h"
 #include "message.h"
 #include "options.h"
 

diff --git a/dlls/kernel/toolhelp.c b/dlls/kernel/toolhelp.c
index c75e899..e4872f7 100644
--- a/dlls/kernel/toolhelp.c
+++ b/dlls/kernel/toolhelp.c

@@ -13,7 +13,6 @@
 #include "wine/winbase16.h"
 #include "winerror.h"
 #include "local.h"
-#include "process.h"
 #include "tlhelp32.h"
 #include "toolhelp.h"
 #include "heap.h"

diff --git a/dlls/ntdll/exception.c b/dlls/ntdll/exception.c
index 94ebae4..ed3878e 100644
--- a/dlls/ntdll/exception.c
+++ b/dlls/ntdll/exception.c

@@ -9,7 +9,6 @@
 #include <signal.h>
 #include "winnt.h"
 #include "ntddk.h"
-#include "process.h"
 #include "global.h"
 #include "wine/exception.h"
 #include "stackframe.h"

diff --git a/dlls/ole32/ole2.c b/dlls/ole32/ole2.c
index 369fce8..adb80c0 100644
--- a/dlls/ole32/ole2.c
+++ b/dlls/ole32/ole2.c

@@ -16,7 +16,6 @@
 #include "winuser.h"
 #include "winerror.h"
 #include "ole2.h"
-#include "process.h"
 #include "commctrl.h"
 #include "wine/obj_clientserver.h"
 #include "wine/winbase16.h"
@@ -215,8 +214,9 @@
  * NOTES
  *   Is DWORD really the correct return type for this function?
  */
-DWORD WINAPI CoGetCurrentProcess(void) {
-	return (DWORD)PROCESS_Current();
+DWORD WINAPI CoGetCurrentProcess(void)
+{
+	return GetCurrentProcessId();
 }
 
 /******************************************************************************

diff --git a/include/authors.h b/dlls/shell32/authors.h
similarity index 99%
rename from include/authors.h
rename to dlls/shell32/authors.h
index 4a3355e..dc94b3c 100644
--- a/include/authors.h
+++ b/dlls/shell32/authors.h

@@ -234,8 +234,8 @@
     "Rick Richardson",
     "Douglas Ridgway",
     "Robert Riggs",
-    "Bernhard Rosenkraenzer",
     "Matthew Robertson",
+    "Bernhard Rosenkraenzer",
     "Pavel Roskin",
     "Herbert Rosmanith",
     "Lilia Roumiantseva",

diff --git a/dlls/shell32/brsfolder.c b/dlls/shell32/brsfolder.c
index 468775b..9cc9105 100644
--- a/dlls/shell32/brsfolder.c
+++ b/dlls/shell32/brsfolder.c

@@ -7,10 +7,8 @@
 #include "win.h"
 #include "debugtools.h"
 #include "winreg.h"
-#include "authors.h"
 #include "winnls.h"
 #include "commctrl.h"
-#include "spy.h"
 
 #include "wine/obj_base.h"
 #include "wine/obj_enumidlist.h"

diff --git a/dlls/shell32/shellord.c b/dlls/shell32/shellord.c
index d19e359..bce93d8 100644
--- a/dlls/shell32/shellord.c
+++ b/dlls/shell32/shellord.c

@@ -502,8 +502,6 @@
  *	%S ???
  *	%* all following parameters (see batfile)
  */
-#include "process.h" /* we can get rid of it hopefully */
-#include "task.h"
 BOOL WINAPI ShellExecuteExA (LPSHELLEXECUTEINFOA sei)
 { 	CHAR szApplicationName[MAX_PATH],szCommandline[MAX_PATH],szPidl[20];
 	LPSTR pos;

diff --git a/dlls/shell32/shlview.c b/dlls/shell32/shlview.c
index 9e53155..318aa6e 100644
--- a/dlls/shell32/shlview.c
+++ b/dlls/shell32/shlview.c

@@ -38,7 +38,6 @@
 #include "wine/obj_dragdrop.h"
 #include "wine/undocshell.h"
 #include "shresdef.h"
-#include "spy.h"
 #include "debugtools.h"
 #include "winerror.h"
 #include "wine/winestring.h"
@@ -47,7 +46,7 @@
 #include "pidl.h"
 #include "shell32_main.h"
 
-DEFAULT_DEBUG_CHANNEL(shell)
+DEFAULT_DEBUG_CHANNEL(shell);
 
 typedef struct
 {   BOOL    bIsAscending;
@@ -1283,7 +1282,7 @@
 	    }
 	    break;
 	  default:
-	    TRACE("-- %p WM_COMMAND %s unhandled\n", This, SPY_GetMsgName(lpnmh->code));
+	    TRACE("-- %p WM_COMMAND %x unhandled\n", This, lpnmh->code);
 	    break;;
 	}
 	return 0;

diff --git a/dlls/win32s/w32sys.c b/dlls/win32s/w32sys.c
index 529bbf8..c4995aa 100644
--- a/dlls/win32s/w32sys.c
+++ b/dlls/win32s/w32sys.c

@@ -6,11 +6,17 @@
  */
 
 #include "windef.h"
-#include "w32sys.h"
-
 #include "debugtools.h"
 
-DEFAULT_DEBUG_CHANNEL(dll)
+DEFAULT_DEBUG_CHANNEL(dll);
+
+typedef struct
+{
+    BYTE   bMajor;
+    BYTE   bMinor;
+    WORD   wBuildNumber;
+    BOOL16 fDebug;
+} WIN32SINFO, *LPWIN32SINFO;
 
 /***********************************************************************
  *           GetWin32sInfo   (W32SYS.12)

diff --git a/files/file.c b/files/file.c
index 206f460..ad9e86b 100644
--- a/files/file.c
+++ b/files/file.c

@@ -37,7 +37,6 @@
 #include "wine/winbase16.h"
 #include "wine/winestring.h"
 #include "drive.h"
-#include "device.h"
 #include "file.h"
 #include "global.h"
 #include "heap.h"

diff --git a/include/metafiledrv.h b/graphics/metafiledrv/metafiledrv.h
similarity index 100%
rename from include/metafiledrv.h
rename to graphics/metafiledrv/metafiledrv.h


diff --git a/include/device.h b/include/device.h
deleted file mode 100644
index d0f0c7f..0000000
--- a/include/device.h
+++ /dev/null

@@ -1,8 +0,0 @@
-#ifndef __WINE_DEVICE_H
-#define __WINE_DEVICE_H
-
-#include "winbase.h"
-
-extern HANDLE DEVICE_Open( LPCSTR filename, DWORD access,
-                             LPSECURITY_ATTRIBUTES sa );
-#endif

diff --git a/include/file.h b/include/file.h
index 4250243..91c084d 100644
--- a/include/file.h
+++ b/include/file.h

@@ -73,4 +73,7 @@
                            const char *long_mask, int drive, BYTE attr,
                            int skip, WIN32_FIND_DATAA *entry );
 
+/* win32/device.c */
+extern HANDLE DEVICE_Open( LPCSTR filename, DWORD access, LPSECURITY_ATTRIBUTES sa );
+
 #endif  /* __WINE_FILE_H */

diff --git a/include/w32sys.h b/include/w32sys.h
deleted file mode 100644
index 73e072f..0000000
--- a/include/w32sys.h
+++ /dev/null

@@ -1,19 +0,0 @@
-/*
- * W32SYS
- * 
- * Copyright (c) 1996 Anand Kumria
- */
-
-#ifndef __WINE_W32SYS_H
-#define __WINE_W32SYS_H
-
-#include "windef.h"
-
-typedef struct _WIN32SINFO {
-    BYTE   bMajor;
-    BYTE   bMinor;
-    WORD   wBuildNumber;
-    BOOL16 fDebug;
-} WIN32SINFO, *LPWIN32SINFO;
-
-#endif /* __WINE_W32SYS_H */

diff --git a/tools/make_authors b/tools/make_authors
index 6f35aee..23e0166 100755
--- a/tools/make_authors
+++ b/tools/make_authors

@@ -1,6 +1,6 @@
 #! /usr/bin/perl
 #
-# Generate AUTHORS and include/authors.h
+# Generate AUTHORS and dlls/shell32/authors.h
 #
 open(AUTHORS,"<AUTHORS") or die "Can't open AUTHORS";
 open(NEWAUTHORS,">AUTHORS.new");
@@ -37,7 +37,7 @@
 print "Created AUTHORS.new\n";
 
 # Build authors.h file
-open(NEWAUTHORS_H,">include/authors.h");
+open(NEWAUTHORS_H,">dlls/shell32/authors.h");
 
 print NEWAUTHORS_H <<EOF;
 #ifndef __WINE_AUTHORS_H
@@ -55,4 +55,4 @@
 print NEWAUTHORS_H "    0\n};\n";
 print NEWAUTHORS_H "\n#endif  /* __WINE_AUTHORS_H */\n";
 
-print "Created include/authors.h\n";
+print "Created dlls/shell32/authors.h\n";

diff --git a/win32/file.c b/win32/file.c
index cc735c4..07702a5 100644
--- a/win32/file.c
+++ b/win32/file.c

@@ -23,7 +23,6 @@
 #include "winbase.h"
 #include "winerror.h"
 #include "file.h"
-#include "device.h"
 #include "process.h"
 #include "heap.h"
 #include "debugtools.h"