From dbd1890dee0d1f30ec560702a1a2eee3f554d272 Mon Sep 17 00:00:00 2001
From: Thomas Bluemel <thomas@reactsoft.com>
Date: Mon, 8 Nov 2004 02:16:06 +0000
Subject: [PATCH] make better use of precompiled headers

svn path=/trunk/; revision=11595
---
 reactos/subsys/system/cmd/alias.c    |  9 +--------
 reactos/subsys/system/cmd/attrib.c   |  7 +------
 reactos/subsys/system/cmd/batch.c    | 10 +---------
 reactos/subsys/system/cmd/beep.c     |  8 +-------
 reactos/subsys/system/cmd/call.c     | 10 +---------
 reactos/subsys/system/cmd/chcp.c     |  8 +-------
 reactos/subsys/system/cmd/choice.c   | 10 +---------
 reactos/subsys/system/cmd/cls.c      |  7 +------
 reactos/subsys/system/cmd/cmd.c      | 15 +--------------
 reactos/subsys/system/cmd/cmdinput.c |  6 ------
 reactos/subsys/system/cmd/cmdtable.c |  3 ---
 reactos/subsys/system/cmd/color.c    |  8 ++------
 reactos/subsys/system/cmd/console.c  |  8 +-------
 reactos/subsys/system/cmd/copy.c     | 13 ++-----------
 reactos/subsys/system/cmd/date.c     |  7 +------
 reactos/subsys/system/cmd/del.c      | 11 +----------
 reactos/subsys/system/cmd/delay.c    |  6 +-----
 reactos/subsys/system/cmd/dir.c      | 10 ++--------
 reactos/subsys/system/cmd/dirstack.c |  8 +-------
 reactos/subsys/system/cmd/echo.c     |  8 +-------
 reactos/subsys/system/cmd/error.c    |  5 -----
 reactos/subsys/system/cmd/filecomp.c |  7 -------
 reactos/subsys/system/cmd/for.c      |  8 --------
 reactos/subsys/system/cmd/free.c     |  8 +-------
 reactos/subsys/system/cmd/goto.c     |  7 -------
 reactos/subsys/system/cmd/history.c  |  9 +--------
 reactos/subsys/system/cmd/if.c       |  7 -------
 reactos/subsys/system/cmd/internal.c |  6 ------
 reactos/subsys/system/cmd/label.c    |  7 +------
 reactos/subsys/system/cmd/locale.c   |  5 -----
 reactos/subsys/system/cmd/makefile   |  2 ++
 reactos/subsys/system/cmd/memory.c   |  7 +------
 reactos/subsys/system/cmd/misc.c     |  7 -------
 reactos/subsys/system/cmd/move.c     |  7 +------
 reactos/subsys/system/cmd/msgbox.c   |  6 +-----
 reactos/subsys/system/cmd/path.c     |  9 +--------
 reactos/subsys/system/cmd/pause.c    |  9 +--------
 reactos/subsys/system/cmd/precomp.h  | 15 ++++++++++++++-
 reactos/subsys/system/cmd/prompt.c   |  7 -------
 reactos/subsys/system/cmd/redir.c    |  7 +------
 reactos/subsys/system/cmd/ren.c      |  9 +--------
 reactos/subsys/system/cmd/screen.c   |  7 +------
 reactos/subsys/system/cmd/set.c      |  7 +------
 reactos/subsys/system/cmd/shift.c    |  6 ------
 reactos/subsys/system/cmd/start.c    |  7 +------
 reactos/subsys/system/cmd/strtoclr.c |  4 ----
 reactos/subsys/system/cmd/time.c     |  7 +------
 reactos/subsys/system/cmd/timer.c    |  7 +------
 reactos/subsys/system/cmd/title.c    |  6 +-----
 reactos/subsys/system/cmd/type.c     |  6 +-----
 reactos/subsys/system/cmd/ver.c      |  5 -----
 reactos/subsys/system/cmd/verify.c   |  6 +-----
 reactos/subsys/system/cmd/vol.c      |  6 +-----
 reactos/subsys/system/cmd/where.c    |  4 ----
 reactos/subsys/system/cmd/window.c   |  9 ++-------
 55 files changed, 58 insertions(+), 355 deletions(-)

diff --git a/reactos/subsys/system/cmd/alias.c b/reactos/subsys/system/cmd/alias.c
index 1280e68bfba..820d26bcb4f 100644
--- a/reactos/subsys/system/cmd/alias.c
+++ b/reactos/subsys/system/cmd/alias.c
@@ -27,17 +27,10 @@
  */
 
 
-#include "config.h"
+#include "precomp.h"
 
 #ifdef FEATURE_ALIASES
 
-#include "precomp.h"
-#include <tchar.h>
-#include <stdlib.h>
-#include <string.h>
-#include <ctype.h>
-
-
 typedef struct tagALIAS
 {
 	struct tagALIAS *next;
diff --git a/reactos/subsys/system/cmd/attrib.c b/reactos/subsys/system/cmd/attrib.c
index 4d2b9db488d..e21f3a053f7 100644
--- a/reactos/subsys/system/cmd/attrib.c
+++ b/reactos/subsys/system/cmd/attrib.c
@@ -29,15 +29,10 @@
  *        Added handling of multiple filenames.
  */
 
-#include "config.h"
+#include "precomp.h"
 
 #ifdef INCLUDE_CMD_ATTRIB
 
-#include "precomp.h"
-#include <tchar.h>
-#include <string.h>
-#include <ctype.h>
-
 
 static VOID
 PrintAttribute (LPTSTR pszPath, LPTSTR pszFile, BOOL bRecurse)
diff --git a/reactos/subsys/system/cmd/batch.c b/reactos/subsys/system/cmd/batch.c
index 347133de39c..2f29cd4d8bd 100644
--- a/reactos/subsys/system/cmd/batch.c
+++ b/reactos/subsys/system/cmd/batch.c
@@ -1,4 +1,4 @@
-/* $Id: batch.c,v 1.4 2004/08/15 22:15:23 chorns Exp $
+/* $Id: batch.c,v 1.5 2004/11/08 02:16:06 weiden Exp $
  *
  *  BATCH.C - batch file processor for CMD.EXE.
  *
@@ -56,15 +56,7 @@
  *        Fixes made to get "for" working.
  */
 
-#include "config.h"
-
 #include "precomp.h"
-#include <tchar.h>
-#include <string.h>
-#include <stdlib.h>
-#include <ctype.h>
-
-#include "batch.h"
 
 
 /* The stack of current batch contexts.
diff --git a/reactos/subsys/system/cmd/beep.c b/reactos/subsys/system/cmd/beep.c
index b24a5eace16..687f0b1a5bc 100644
--- a/reactos/subsys/system/cmd/beep.c
+++ b/reactos/subsys/system/cmd/beep.c
@@ -21,16 +21,10 @@
  *        Redirection ready!
  */
 
-#include "config.h"
+#include "precomp.h"
 
 #ifdef INCLUDE_CMD_BEEP
 
-#include "precomp.h"
-#include <tchar.h>
-#include <string.h>
-
-#include "batch.h"
-
 
 INT cmd_beep (LPTSTR cmd, LPTSTR param)
 {
diff --git a/reactos/subsys/system/cmd/call.c b/reactos/subsys/system/cmd/call.c
index 0129ca245e7..c07c75377bd 100644
--- a/reactos/subsys/system/cmd/call.c
+++ b/reactos/subsys/system/cmd/call.c
@@ -1,4 +1,4 @@
-/* $Id: call.c,v 1.3 2004/08/15 22:15:23 chorns Exp $
+/* $Id: call.c,v 1.4 2004/11/08 02:16:06 weiden Exp $
  *
  *  CALL.C - call internal batch command.
  *
@@ -26,15 +26,7 @@
  *        Unicode and redirection safe!
  */
 
-#include "config.h"
-
 #include "precomp.h"
-#include <tchar.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "batch.h"
 
 
 /*
diff --git a/reactos/subsys/system/cmd/chcp.c b/reactos/subsys/system/cmd/chcp.c
index 09622d6ac04..3ebd03f4dd4 100644
--- a/reactos/subsys/system/cmd/chcp.c
+++ b/reactos/subsys/system/cmd/chcp.c
@@ -9,16 +9,10 @@
  *
  */
 
-#include "config.h"
+#include "precomp.h"
 
 #ifdef INCLUDE_CMD_CHCP
 
-#include "precomp.h"
-#include <tchar.h>
-#include <stdlib.h>
-#include <string.h>
-
-
 INT CommandChcp (LPTSTR cmd, LPTSTR param)
 {
 	LPTSTR *arg;
diff --git a/reactos/subsys/system/cmd/choice.c b/reactos/subsys/system/cmd/choice.c
index ccc83161b00..6cc6426d0db 100644
--- a/reactos/subsys/system/cmd/choice.c
+++ b/reactos/subsys/system/cmd/choice.c
@@ -14,18 +14,10 @@
  *        Fixed timeout.
  */
 
-#include "config.h"
+#include "precomp.h"
 
 #ifdef INCLUDE_CMD_CHOICE
 
-#include "precomp.h"
-#include <stdlib.h>
-#include <string.h>
-#include <ctype.h>
-#include <tchar.h>
-
-#include "batch.h"
-
 
 #define GC_TIMEOUT	-1
 #define GC_NOKEY	0	//an event occurred but it wasn't a key pressed
diff --git a/reactos/subsys/system/cmd/cls.c b/reactos/subsys/system/cmd/cls.c
index 3b87f745e4c..d1dfd3d6fe2 100644
--- a/reactos/subsys/system/cmd/cls.c
+++ b/reactos/subsys/system/cmd/cls.c
@@ -23,15 +23,10 @@
  *        Redirection ready!
  */
 
-#include "config.h"
+#include "precomp.h"
 
 #ifdef INCLUDE_CMD_CLS
 
-#include "precomp.h"
-#include <tchar.h>
-#include <string.h>
-
-
 INT cmd_cls (LPTSTR cmd, LPTSTR param)
 {
 	DWORD dwWritten;
diff --git a/reactos/subsys/system/cmd/cmd.c b/reactos/subsys/system/cmd/cmd.c
index 01160bd8f7a..036bd7c14f5 100644
--- a/reactos/subsys/system/cmd/cmd.c
+++ b/reactos/subsys/system/cmd/cmd.c
@@ -1,4 +1,4 @@
-/* $Id: cmd.c,v 1.19 2004/08/22 20:47:20 hbirr Exp $
+/* $Id: cmd.c,v 1.20 2004/11/08 02:16:06 weiden Exp $
  *
  *  CMD.C - command-line interface.
  *
@@ -131,25 +131,12 @@
  *       Added ShellExecute call when all else fails to be able to "launch" any file.
  */
 
-#include "config.h"
-
 #include "precomp.h"
-#include <tchar.h>
-#include <string.h>
-#include <stdlib.h>
-#include <ctype.h>
-#include <stdio.h>
-#include <winnt.h>
-#include <winternl.h>
 
 #ifndef NT_SUCCESS
 #define NT_SUCCESS(StatCode)  ((NTSTATUS)(StatCode) >= 0)
 #endif
 
-#include "batch.h"
-
-#include <shellapi.h>
-
 typedef NTSTATUS (STDCALL *NtQueryInformationProcessProc)(HANDLE, PROCESSINFOCLASS,
                                                           PVOID, ULONG, PULONG);
 typedef NTSTATUS (STDCALL *NtReadVirtualMemoryProc)(HANDLE, PVOID, PVOID, ULONG, PULONG);
diff --git a/reactos/subsys/system/cmd/cmdinput.c b/reactos/subsys/system/cmd/cmdinput.c
index 64ccfeb006e..daa5c71d602 100644
--- a/reactos/subsys/system/cmd/cmdinput.c
+++ b/reactos/subsys/system/cmd/cmdinput.c
@@ -97,13 +97,7 @@
  *        Fixed problems when the screen was scrolled away.
  */
 
-#include "config.h"
-
 #include "precomp.h"
-#include <tchar.h>
-#include <string.h>
-
-#include "batch.h"
 
 
 SHORT maxx;
diff --git a/reactos/subsys/system/cmd/cmdtable.c b/reactos/subsys/system/cmd/cmdtable.c
index 69fe4c0341d..ed0ce7cf54d 100644
--- a/reactos/subsys/system/cmd/cmdtable.c
+++ b/reactos/subsys/system/cmd/cmdtable.c
@@ -17,10 +17,7 @@
  *        Unicode ready!
  */
 
-#include "config.h"
-
 #include "precomp.h"
-#include <tchar.h>
 
 
 /* a list of all the internal commands, associating their command names */
diff --git a/reactos/subsys/system/cmd/color.c b/reactos/subsys/system/cmd/color.c
index 907c33fdd91..60ff3bac857 100644
--- a/reactos/subsys/system/cmd/color.c
+++ b/reactos/subsys/system/cmd/color.c
@@ -1,4 +1,4 @@
-/* $Id: color.c,v 1.5 2004/08/15 22:15:23 chorns Exp $
+/* $Id: color.c,v 1.6 2004/11/08 02:16:06 weiden Exp $
  *
  *  COLOR.C - color internal command.
  *
@@ -18,13 +18,9 @@
  *        4nt's syntax implemented
  */
 
-#include "config.h"
+#include "precomp.h"
 
 #ifdef INCLUDE_CMD_COLOR
-#include "precomp.h"
-#include <tchar.h>
-#include <string.h>
-#include <stdlib.h>
 
 
 static VOID ColorHelp (VOID)
diff --git a/reactos/subsys/system/cmd/console.c b/reactos/subsys/system/cmd/console.c
index 3d17889b65b..212f392e7ae 100644
--- a/reactos/subsys/system/cmd/console.c
+++ b/reactos/subsys/system/cmd/console.c
@@ -1,4 +1,4 @@
-/* $Id: console.c,v 1.9 2004/11/02 20:47:05 weiden Exp $
+/* $Id: console.c,v 1.10 2004/11/08 02:16:06 weiden Exp $
  *
  *  CONSOLE.C - console input/output functions.
  *
@@ -9,13 +9,7 @@
  *        started
  */
 
-#include "config.h"
-
 #include "precomp.h"
-#include <tchar.h>
-#include <stdio.h>
-#include <stdarg.h>
-#include <string.h>
 
 
 #define OUTPUT_BUFFER_SIZE  4096
diff --git a/reactos/subsys/system/cmd/copy.c b/reactos/subsys/system/cmd/copy.c
index 22e766df072..89a114252b2 100644
--- a/reactos/subsys/system/cmd/copy.c
+++ b/reactos/subsys/system/cmd/copy.c
@@ -1,4 +1,4 @@
-/* $Id: copy.c,v 1.5 2004/08/15 22:15:23 chorns Exp $
+/* $Id: copy.c,v 1.6 2004/11/08 02:16:06 weiden Exp $
  *
  *  COPY.C -- copy internal command.
  *
@@ -22,19 +22,10 @@
  *        Disabled prompting when used in batch mode.
  */
 
-#include "config.h"
+#include "precomp.h"
 
 #ifdef INCLUDE_CMD_COPY
 
-#include "precomp.h"
-#include <tchar.h>
-#include <string.h>
-#include <stdlib.h>
-#include <ctype.h>
-#include <tchar.h>
-
-#include "batch.h"
-
 
 #define VERIFY  1               /* VERIFY Switch */
 #define BINARY  2               /* File is to be copied as BINARY */
diff --git a/reactos/subsys/system/cmd/date.c b/reactos/subsys/system/cmd/date.c
index 2cef29e1638..90b9d713aa5 100644
--- a/reactos/subsys/system/cmd/date.c
+++ b/reactos/subsys/system/cmd/date.c
@@ -28,15 +28,10 @@
  *        Fixed date input bug.
  */
 
-#include "config.h"
+#include "precomp.h"
 
 #ifdef INCLUDE_CMD_DATE
 
-#include "precomp.h"
-#include <tchar.h>
-#include <string.h>
-#include <ctype.h>
-
 
 static WORD awMonths[2][13] =
 {
diff --git a/reactos/subsys/system/cmd/del.c b/reactos/subsys/system/cmd/del.c
index b12b446ec0c..1483bb49c2a 100644
--- a/reactos/subsys/system/cmd/del.c
+++ b/reactos/subsys/system/cmd/del.c
@@ -34,19 +34,10 @@
  *        Added prompt ("/P"), yes ("/Y") and wipe("/W") option.
  */
 
-#include "config.h"
+#include "precomp.h"
 
 #ifdef INCLUDE_CMD_DEL
 
-#include "precomp.h"
-#include <tchar.h>
-#include <string.h>
-#include <stdlib.h>
-#include <ctype.h>
-#include <math.h>
-
-#include "batch.h"
-
 
 enum
 {
diff --git a/reactos/subsys/system/cmd/delay.c b/reactos/subsys/system/cmd/delay.c
index 984244106d5..241baa991e2 100644
--- a/reactos/subsys/system/cmd/delay.c
+++ b/reactos/subsys/system/cmd/delay.c
@@ -9,14 +9,10 @@
  *
  */
 
-#include "config.h"
+#include "precomp.h"
 
 #ifdef INCLUDE_CMD_DELAY
 
-#include "precomp.h"
-#include <tchar.h>
-#include <stdlib.h>
-
 
 INT CommandDelay (LPTSTR cmd, LPTSTR param)
 {
diff --git a/reactos/subsys/system/cmd/dir.c b/reactos/subsys/system/cmd/dir.c
index 9d27405eca5..dcfd190d4e3 100644
--- a/reactos/subsys/system/cmd/dir.c
+++ b/reactos/subsys/system/cmd/dir.c
@@ -1,4 +1,4 @@
-/* $Id: dir.c,v 1.11 2004/08/15 22:15:23 chorns Exp $
+/* $Id: dir.c,v 1.12 2004/11/08 02:16:06 weiden Exp $
  *
  *  DIR.C - dir internal command.
  *
@@ -121,15 +121,9 @@
  *        Fix /w to print long names.
  */
 
-#include "config.h"
+#include "precomp.h"
 
 #ifdef INCLUDE_CMD_DIR
-#include "precomp.h"
-#include <tchar.h>
-#include <string.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <ctype.h>
 
 
 /* flag definitions */
diff --git a/reactos/subsys/system/cmd/dirstack.c b/reactos/subsys/system/cmd/dirstack.c
index dfefe8ecce0..8d5b7a885fd 100644
--- a/reactos/subsys/system/cmd/dirstack.c
+++ b/reactos/subsys/system/cmd/dirstack.c
@@ -14,16 +14,10 @@
  *        Added DIRS command.
  */
 
-#include "config.h"
+#include "precomp.h"
 
 #ifdef FEATURE_DIRECTORY_STACK
 
-#include "precomp.h"
-#include <tchar.h>
-#include <string.h>
-#include <stdlib.h>
-
-
 typedef struct tagDIRENTRY
 {
 	struct tagDIRENTRY *prev;
diff --git a/reactos/subsys/system/cmd/echo.c b/reactos/subsys/system/cmd/echo.c
index c70e3cfe844..4d6bf756a98 100644
--- a/reactos/subsys/system/cmd/echo.c
+++ b/reactos/subsys/system/cmd/echo.c
@@ -1,4 +1,4 @@
-/* $Id: echo.c,v 1.4 2004/08/15 22:15:23 chorns Exp $
+/* $Id: echo.c,v 1.5 2004/11/08 02:16:06 weiden Exp $
  *
  *  ECHO.C - internal echo commands.
  *
@@ -24,13 +24,7 @@
  *        Implemented 'echo.' and 'echoerr.'.
  */
 
-#include "config.h"
-
 #include "precomp.h"
-#include <tchar.h>
-#include <string.h>
-
-#include "batch.h"
 
 
 INT CommandEcho (LPTSTR cmd, LPTSTR param)
diff --git a/reactos/subsys/system/cmd/error.c b/reactos/subsys/system/cmd/error.c
index 8495a76d7b4..cf383c571f9 100644
--- a/reactos/subsys/system/cmd/error.c
+++ b/reactos/subsys/system/cmd/error.c
@@ -17,12 +17,7 @@
  *        Use FormatMessage() for error reports.
  */
 
-#include "config.h"
-
 #include "precomp.h"
-#include <tchar.h>
-#include <stdio.h>
-#include <stdarg.h>
 
 
 #define INVALID_SWITCH		_T("Invalid switch - /%c\n")
diff --git a/reactos/subsys/system/cmd/filecomp.c b/reactos/subsys/system/cmd/filecomp.c
index a91b1c71ab2..6b8ffc35305 100644
--- a/reactos/subsys/system/cmd/filecomp.c
+++ b/reactos/subsys/system/cmd/filecomp.c
@@ -20,14 +20,7 @@
  *       Now expands lfn even when trailing " is omitted.
  */
 
-#include "config.h"
-
 #include "precomp.h"
-#include <tchar.h>
-#include <string.h>
-#include <stdlib.h>
-#include <ctype.h>
-#include <stdio.h>
 
 
 #ifdef FEATURE_UNIX_FILENAME_COMPLETION
diff --git a/reactos/subsys/system/cmd/for.c b/reactos/subsys/system/cmd/for.c
index 10095611cbc..a646ad022cf 100644
--- a/reactos/subsys/system/cmd/for.c
+++ b/reactos/subsys/system/cmd/for.c
@@ -27,15 +27,7 @@
  *        code in other files fixed, too.
  */
 
-#include "config.h"
-
 #include "precomp.h"
-#include <tchar.h>
-#include <string.h>
-#include <stdlib.h>
-#include <ctype.h>
-
-#include "batch.h"
 
 
 /*
diff --git a/reactos/subsys/system/cmd/free.c b/reactos/subsys/system/cmd/free.c
index 667fb621c3b..1d346c1d002 100644
--- a/reactos/subsys/system/cmd/free.c
+++ b/reactos/subsys/system/cmd/free.c
@@ -8,16 +8,10 @@
  *        Started.
  */
 
-#include "config.h"
+#include "precomp.h"
 
 #ifdef INCLUDE_CMD_FREE
 
-#include "precomp.h"
-#include <tchar.h>
-#include <string.h>
-#include <stdio.h>
-#include <ctype.h>
-
 
 /*
  * convert
diff --git a/reactos/subsys/system/cmd/goto.c b/reactos/subsys/system/cmd/goto.c
index 22cc47049fe..76f45597d91 100644
--- a/reactos/subsys/system/cmd/goto.c
+++ b/reactos/subsys/system/cmd/goto.c
@@ -23,14 +23,7 @@
  *        Added help text ("/?").
  */
 
-#include "config.h"
-
 #include "precomp.h"
-#include <tchar.h>
-#include <string.h>
-#include <ctype.h>
-
-#include "batch.h"
 
 
 /*
diff --git a/reactos/subsys/system/cmd/history.c b/reactos/subsys/system/cmd/history.c
index 02a474ad662..345bb3fb2f6 100644
--- a/reactos/subsys/system/cmd/history.c
+++ b/reactos/subsys/system/cmd/history.c
@@ -37,17 +37,10 @@
  *
  */ 
 
-#include "config.h"
+#include "precomp.h"
 
 #ifdef FEATURE_HISTORY
 
-#include "precomp.h"
-#include <tchar.h>
-#include <string.h>
-#include <stdlib.h>
-#include <ctype.h>
-
-
 typedef struct tagHISTORY
 {
 	struct tagHISTORY *prev;
diff --git a/reactos/subsys/system/cmd/if.c b/reactos/subsys/system/cmd/if.c
index d0c5144ebed..1032827c58d 100644
--- a/reactos/subsys/system/cmd/if.c
+++ b/reactos/subsys/system/cmd/if.c
@@ -26,14 +26,7 @@
  *        IF DEFINED variable command
  */
 
-#include "config.h"
-
 #include "precomp.h"
-#include <tchar.h>
-#include <string.h>
-#include <ctype.h>
-
-#include "batch.h"
 
 
 #define X_EXEC 1
diff --git a/reactos/subsys/system/cmd/internal.c b/reactos/subsys/system/cmd/internal.c
index 318b6b339d7..62ab3b98b8c 100644
--- a/reactos/subsys/system/cmd/internal.c
+++ b/reactos/subsys/system/cmd/internal.c
@@ -124,13 +124,7 @@
  *        Improved chdir/cd command.
  */
 
-#include "config.h"
-
 #include "precomp.h"
-#include <tchar.h>
-#include <string.h>
-#include <stdlib.h>
-#include <ctype.h>
 
 
 #ifdef INCLUDE_CMD_CHDIR
diff --git a/reactos/subsys/system/cmd/label.c b/reactos/subsys/system/cmd/label.c
index 9128630b71b..1a5f7254c45 100644
--- a/reactos/subsys/system/cmd/label.c
+++ b/reactos/subsys/system/cmd/label.c
@@ -14,15 +14,10 @@
  *        Unicode ready!
  */
 
-#include "config.h"
+#include "precomp.h"
 
 #ifdef INCLUDE_CMD_LABEL
 
-#include "precomp.h"
-#include <tchar.h>
-#include <string.h>
-#include <ctype.h>
-
 
 INT cmd_label (LPTSTR cmd, LPTSTR param)
 {
diff --git a/reactos/subsys/system/cmd/locale.c b/reactos/subsys/system/cmd/locale.c
index cfcd65c4e3b..e72f05204dd 100644
--- a/reactos/subsys/system/cmd/locale.c
+++ b/reactos/subsys/system/cmd/locale.c
@@ -11,12 +11,7 @@
  *        Unicode safe!
  */
 
-#include "config.h"
-
 #include "precomp.h"
-#include <tchar.h>
-#include <string.h>
-#include <stdlib.h>
 
 
 TCHAR cDateSeparator;
diff --git a/reactos/subsys/system/cmd/makefile b/reactos/subsys/system/cmd/makefile
index e108f33e306..3b9cf42b398 100644
--- a/reactos/subsys/system/cmd/makefile
+++ b/reactos/subsys/system/cmd/makefile
@@ -33,4 +33,6 @@ include $(PATH_TO_TOP)/rules.mak
 
 include $(TOOLS_PATH)/helper.mk
 
+include $(TOOLS_PATH)/depend.mk
+
 # EOF
diff --git a/reactos/subsys/system/cmd/memory.c b/reactos/subsys/system/cmd/memory.c
index 98f70c4f4bb..a7da82b06c4 100644
--- a/reactos/subsys/system/cmd/memory.c
+++ b/reactos/subsys/system/cmd/memory.c
@@ -8,15 +8,10 @@
  *        Started.
  */
 
-#include "config.h"
+#include "precomp.h"
 
 #ifdef INCLUDE_CMD_MEMORY
 
-#include "precomp.h"
-#include <tchar.h>
-#include <string.h>
-#include <ctype.h>
-
 
 /*
  * convert
diff --git a/reactos/subsys/system/cmd/misc.c b/reactos/subsys/system/cmd/misc.c
index 9dd4ec5ce31..0762669cc7e 100644
--- a/reactos/subsys/system/cmd/misc.c
+++ b/reactos/subsys/system/cmd/misc.c
@@ -29,14 +29,7 @@
  *        Added PagePrompt() and FilePrompt().
  */
 
-#include "config.h"
-
 #include "precomp.h"
-#include <ctype.h>
-#include <string.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <tchar.h>
 
 
 /*
diff --git a/reactos/subsys/system/cmd/move.c b/reactos/subsys/system/cmd/move.c
index ea74e2c9b1c..55803c421f4 100644
--- a/reactos/subsys/system/cmd/move.c
+++ b/reactos/subsys/system/cmd/move.c
@@ -22,15 +22,10 @@
  *        Added "/N" option.
  */
 
-#include "config.h"
+#include "precomp.h"
 
 #ifdef INCLUDE_CMD_MOVE
 
-#include "precomp.h"
-#include <tchar.h>
-#include <string.h>
-#include <ctype.h>
-
 
 #define OVERWRITE_NO     0
 #define OVERWRITE_YES    1
diff --git a/reactos/subsys/system/cmd/msgbox.c b/reactos/subsys/system/cmd/msgbox.c
index 7f7b2c1ca2b..ccf4555ca22 100644
--- a/reactos/subsys/system/cmd/msgbox.c
+++ b/reactos/subsys/system/cmd/msgbox.c
@@ -7,13 +7,9 @@
  *     started - Paolo Pantaleo <paolopan@freemail.it>
  */
 
-#include "config.h"
+#include "precomp.h"
 
 #ifdef INCLUDE_CMD_MSGBOX
-#include "precomp.h"
-#include <ctype.h>
-#include <string.h>
-#include <tchar.h>
 
 
 #define U_TYPE_INIT 0
diff --git a/reactos/subsys/system/cmd/path.c b/reactos/subsys/system/cmd/path.c
index 0fb680008f6..4f11d522754 100644
--- a/reactos/subsys/system/cmd/path.c
+++ b/reactos/subsys/system/cmd/path.c
@@ -22,17 +22,10 @@
  *    24-Jan-1999 (Eric Kohl <ekohl@abo.rhein-zeitung.de>)
  *        Fixed Win32 environment handling.
  */
-
-#include "config.h"
+#include "precomp.h"
 
 #ifdef INCLUDE_CMD_PATH
 
-#include "precomp.h"
-#include <tchar.h>
-#include <string.h>
-#include <stdlib.h>
-
-
 /* size of environment variable buffer */
 #define ENV_BUFFER_SIZE 1024
 
diff --git a/reactos/subsys/system/cmd/pause.c b/reactos/subsys/system/cmd/pause.c
index 50146315f4e..c12362f268c 100644
--- a/reactos/subsys/system/cmd/pause.c
+++ b/reactos/subsys/system/cmd/pause.c
@@ -17,17 +17,10 @@
  *        Unicode ready!
  */
 
-#include "config.h"
+#include "precomp.h"
 
 #ifdef INCLUDE_CMD_PAUSE
 
-#include "precomp.h"
-#include <tchar.h>
-#include <string.h>
-
-#include "batch.h"
-
-
 /*
  * Perform PAUSE command.
  *
diff --git a/reactos/subsys/system/cmd/precomp.h b/reactos/subsys/system/cmd/precomp.h
index 13ddcf84705..d2e970a4f00 100644
--- a/reactos/subsys/system/cmd/precomp.h
+++ b/reactos/subsys/system/cmd/precomp.h
@@ -1,2 +1,15 @@
-#include "cmd.h"
 #include <windows.h>
+#include <winnt.h>
+#include <winternl.h>
+#include <shellapi.h>
+
+#include <tchar.h>
+#include <ctype.h>
+#include <string.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdarg.h>
+
+#include "cmd.h"
+#include "config.h"
+#include "batch.h"
diff --git a/reactos/subsys/system/cmd/prompt.c b/reactos/subsys/system/cmd/prompt.c
index e71ebed05c2..007cccff2c5 100644
--- a/reactos/subsys/system/cmd/prompt.c
+++ b/reactos/subsys/system/cmd/prompt.c
@@ -43,14 +43,7 @@
  *    24-Jan-1999 (Eric Kohl <ekohl@abo.rhein-zeitung.de>)
  *        Fixed Win32 environment handling.
  */
-
-#include "config.h"
-
 #include "precomp.h"
-#include <tchar.h>
-#include <string.h>
-#include <ctype.h>
-
 
 /*
  * print the command-line prompt
diff --git a/reactos/subsys/system/cmd/redir.c b/reactos/subsys/system/cmd/redir.c
index 26b26994c13..6f49624491c 100644
--- a/reactos/subsys/system/cmd/redir.c
+++ b/reactos/subsys/system/cmd/redir.c
@@ -22,15 +22,10 @@
  *        Added new error AND output redirection "&>" and "&>>".
  */
 
-#include "config.h"
+#include "precomp.h"
 
 #ifdef FEATURE_REDIRECTION
 
-#include "precomp.h"
-#include <tchar.h>
-#include <string.h>
-#include <ctype.h>
-
 
 static BOOL
 IsRedirection (TCHAR c)
diff --git a/reactos/subsys/system/cmd/ren.c b/reactos/subsys/system/cmd/ren.c
index 56e20a1fd49..344cbd5f162 100644
--- a/reactos/subsys/system/cmd/ren.c
+++ b/reactos/subsys/system/cmd/ren.c
@@ -17,17 +17,10 @@
  *        Implemented basic rename code.
  */
 
-#include "config.h"
+#include "precomp.h"
 
 #ifdef INCLUDE_CMD_RENAME
 
-#include "precomp.h"
-#include <tchar.h>
-#include <string.h>
-#include <ctype.h>
-
-#include "batch.h"
-
 enum
 {
   REN_ATTRIBUTES = 0x001,   /* /A : not implemented */
diff --git a/reactos/subsys/system/cmd/screen.c b/reactos/subsys/system/cmd/screen.c
index 3aca98382bf..102b3440b42 100644
--- a/reactos/subsys/system/cmd/screen.c
+++ b/reactos/subsys/system/cmd/screen.c
@@ -9,15 +9,10 @@
  *
  */
 
-#include "config.h"
+#include "precomp.h"
 
 #ifdef INCLUDE_CMD_SCREEN
 
-#include "precomp.h"
-#include <tchar.h>
-#include <stdlib.h>
-#include <ctype.h>
-
 
 INT CommandScreen (LPTSTR cmd, LPTSTR param)
 {
diff --git a/reactos/subsys/system/cmd/set.c b/reactos/subsys/system/cmd/set.c
index a8fb7016604..6a77b383f2b 100644
--- a/reactos/subsys/system/cmd/set.c
+++ b/reactos/subsys/system/cmd/set.c
@@ -31,15 +31,10 @@
  *        Fixed little bug.
  */
 
-#include "config.h"
+#include "precomp.h"
 
 #ifdef INCLUDE_CMD_SET
 
-#include "precomp.h"
-#include <tchar.h>
-#include <string.h>
-#include <stdlib.h>
-
 
 /* initial size of environment variable buffer */
 #define ENV_BUFFER_SIZE  1024
diff --git a/reactos/subsys/system/cmd/shift.c b/reactos/subsys/system/cmd/shift.c
index 54f0ddbffb8..7eae2e476bb 100644
--- a/reactos/subsys/system/cmd/shift.c
+++ b/reactos/subsys/system/cmd/shift.c
@@ -20,13 +20,7 @@
  *        Unicode and redirection safe!
  */
 
-#include "config.h"
-
 #include "precomp.h"
-#include <tchar.h>
-#include <string.h>
-
-#include "batch.h"
 
 
 /*
diff --git a/reactos/subsys/system/cmd/start.c b/reactos/subsys/system/cmd/start.c
index dba22940c54..023b46b3994 100644
--- a/reactos/subsys/system/cmd/start.c
+++ b/reactos/subsys/system/cmd/start.c
@@ -8,14 +8,9 @@
  *        Started.
  */
 
-#include "config.h"
+#include "precomp.h"
 
 #ifdef INCLUDE_CMD_START
-#include "precomp.h"
-#include <tchar.h>
-#include <string.h>
-#include <stdlib.h>
-#include <ctype.h>
 
 
 INT cmd_start (LPTSTR first, LPTSTR rest)
diff --git a/reactos/subsys/system/cmd/strtoclr.c b/reactos/subsys/system/cmd/strtoclr.c
index 4e1f597c43e..3f08c67035c 100644
--- a/reactos/subsys/system/cmd/strtoclr.c
+++ b/reactos/subsys/system/cmd/strtoclr.c
@@ -18,10 +18,6 @@ other are internal service functions*/
 
 #include "precomp.h"
 
-#include <ctype.h>
-#include <tchar.h>
-
-
 #define _B FOREGROUND_BLUE
 #define _G FOREGROUND_GREEN
 #define _R FOREGROUND_RED
diff --git a/reactos/subsys/system/cmd/time.c b/reactos/subsys/system/cmd/time.c
index 484993871ae..160b59a8a81 100644
--- a/reactos/subsys/system/cmd/time.c
+++ b/reactos/subsys/system/cmd/time.c
@@ -21,15 +21,10 @@
  *        Fixed time input bug.
  */
 
-#include "config.h"
+#include "precomp.h"
 
 #ifdef INCLUDE_CMD_TIME
 
-#include "precomp.h"
-#include <tchar.h>
-#include <string.h>
-#include <ctype.h>
-
 
 static BOOL ParseTime (LPTSTR s)
 {
diff --git a/reactos/subsys/system/cmd/timer.c b/reactos/subsys/system/cmd/timer.c
index 1d0c40a72a3..cea50c0e7f0 100644
--- a/reactos/subsys/system/cmd/timer.c
+++ b/reactos/subsys/system/cmd/timer.c
@@ -7,14 +7,9 @@
  *     started - Paolo Pantaleo <paolopan@freemail.it>
  */
 
-#include "config.h"
-
-#ifdef INCLUDE_CMD_TIMER
 #include "precomp.h"
 
-#include <ctype.h>
-#include <string.h>
-#include <tchar.h>
+#ifdef INCLUDE_CMD_TIMER
 
 
 #define NCS_NOT_SPECIFIED -1
diff --git a/reactos/subsys/system/cmd/title.c b/reactos/subsys/system/cmd/title.c
index ad2018f0ccb..853919efd72 100644
--- a/reactos/subsys/system/cmd/title.c
+++ b/reactos/subsys/system/cmd/title.c
@@ -6,14 +6,10 @@
  *	1999-02-11 Emanuele Aliberti
  */
 
-#include "config.h"
+#include "precomp.h"
 
 #ifdef INCLUDE_CMD_TITLE
 
-#include "precomp.h"
-#include <tchar.h>
-#include <string.h>
-
 
 INT cmd_title (LPTSTR cmd, LPTSTR param)
 {
diff --git a/reactos/subsys/system/cmd/type.c b/reactos/subsys/system/cmd/type.c
index 09232392654..e5cac811090 100644
--- a/reactos/subsys/system/cmd/type.c
+++ b/reactos/subsys/system/cmd/type.c
@@ -23,14 +23,10 @@
  *        Added multiple file support (copied from y.c)
  */
 
-#include "config.h"
+#include "precomp.h"
 
 #ifdef INCLUDE_CMD_TYPE
 
-#include "precomp.h"
-#include <tchar.h>
-#include <string.h>
-
 
 INT cmd_type (LPTSTR cmd, LPTSTR param)
 {
diff --git a/reactos/subsys/system/cmd/ver.c b/reactos/subsys/system/cmd/ver.c
index 1fbc6351926..311489961d1 100644
--- a/reactos/subsys/system/cmd/ver.c
+++ b/reactos/subsys/system/cmd/ver.c
@@ -21,12 +21,7 @@
  *        New version info and some output changes.
  */
 
-#include "config.h"
-
 #include "precomp.h"
-#include <tchar.h>
-#include <string.h>
-#include <ctype.h>
 
 
 VOID ShortVersion (VOID)
diff --git a/reactos/subsys/system/cmd/verify.c b/reactos/subsys/system/cmd/verify.c
index f1bd3cb5896..aed1da86e77 100644
--- a/reactos/subsys/system/cmd/verify.c
+++ b/reactos/subsys/system/cmd/verify.c
@@ -15,14 +15,10 @@
  *        Unicode and redirection ready!
  */
 
-#include "config.h"
+#include "precomp.h"
 
 #ifdef INCLUDE_CMD_VERIFY
 
-#include "precomp.h"
-#include <tchar.h>
-#include <string.h>
-
 
 /* global verify flag */
 static BOOL bVerify = FALSE;
diff --git a/reactos/subsys/system/cmd/vol.c b/reactos/subsys/system/cmd/vol.c
index b10ee4239fa..9d17d11ead8 100644
--- a/reactos/subsys/system/cmd/vol.c
+++ b/reactos/subsys/system/cmd/vol.c
@@ -20,14 +20,10 @@
  *        Redirection ready!
  */
 
-#include "config.h"
+#include "precomp.h"
 
 #ifdef INCLUDE_CMD_VOL
 
-#include "precomp.h"
-#include <tchar.h>
-#include <string.h>
-
 
 static INT
 PrintVolumeHeader (LPTSTR pszRootPath)
diff --git a/reactos/subsys/system/cmd/where.c b/reactos/subsys/system/cmd/where.c
index c9daedde89e..d2661fdee9f 100644
--- a/reactos/subsys/system/cmd/where.c
+++ b/reactos/subsys/system/cmd/where.c
@@ -74,11 +74,7 @@
  *
  */
 
-#include "config.h"
-
 #include "precomp.h"
-#include <string.h>
-#include <stdlib.h>
 
 
 /* initial size of environment variable buffer */
diff --git a/reactos/subsys/system/cmd/window.c b/reactos/subsys/system/cmd/window.c
index 677d9955075..ff61cab96a7 100644
--- a/reactos/subsys/system/cmd/window.c
+++ b/reactos/subsys/system/cmd/window.c
@@ -1,4 +1,4 @@
-/* $Id: window.c,v 1.2 2004/08/15 22:15:23 chorns Exp $
+/* $Id: window.c,v 1.3 2004/11/08 02:16:06 weiden Exp $
  *
  * WINDOW.C - activate & window internal commands.
  *
@@ -13,15 +13,10 @@
  */
 
 
-#include "config.h"
+#include "precomp.h"
 
 #if (  defined(INCLUDE_CMD_WINDOW) ||  defined(INCLUDE_CMD_ACTIVATE)  )
 
-#include "precomp.h"
-#include <stdlib.h>
-#include <string.h>
-#include <tchar.h>
-
 
 #define A_MIN		0x01
 #define A_MAX		0x02