[ros-diffs] [ion] 19190: - PCHify freeldr and cleanup some headers (just a start).

- PCHify freeldr and cleanup some headers (just a start).
Freeldr now compiles about 2-4 times faster.
Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/archmach.c
Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c
Deleted: trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.h
Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hwacpi.c
Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hwapm.c
Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hwcpu.c
Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hwpci.c
Deleted: trunk/reactos/boot/freeldr/freeldr/arch/i386/i386.h
Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/i386disk.c
Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/i386vid.c
Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/machpc.c
Deleted: trunk/reactos/boot/freeldr/freeldr/arch/i386/machpc.h
Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/machxbox.c
Deleted: trunk/reactos/boot/freeldr/freeldr/arch/i386/machxbox.h
Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/pccons.c
Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/pcdisk.c
Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/pcmem.c
Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/pcrtc.c
Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/pcvideo.c
Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxcons.c
Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxdisk.c
Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxfont.c
Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxhw.c
Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxmem.c
Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxrtc.c
Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxvideo.c
Modified: trunk/reactos/boot/freeldr/freeldr/bootmgr.c
Modified: trunk/reactos/boot/freeldr/freeldr/cache/blocklist.c
Modified: trunk/reactos/boot/freeldr/freeldr/cache/cache.c
Deleted: trunk/reactos/boot/freeldr/freeldr/cache/cm.h
Modified: trunk/reactos/boot/freeldr/freeldr/cmdline.c
Modified: trunk/reactos/boot/freeldr/freeldr/comm/rs232.c
Modified: trunk/reactos/boot/freeldr/freeldr/custom.c
Modified: trunk/reactos/boot/freeldr/freeldr/debug.c
Modified: trunk/reactos/boot/freeldr/freeldr/disk/disk.c
Modified: trunk/reactos/boot/freeldr/freeldr/disk/partition.c
Modified: trunk/reactos/boot/freeldr/freeldr/drivemap.c
Modified: trunk/reactos/boot/freeldr/freeldr/freeldr.c
Modified: trunk/reactos/boot/freeldr/freeldr/freeldr_base.xml
Modified: trunk/reactos/boot/freeldr/freeldr/freeldr_main.xml
Modified: trunk/reactos/boot/freeldr/freeldr/fs/ext2.c
Deleted: trunk/reactos/boot/freeldr/freeldr/fs/ext2.h
Modified: trunk/reactos/boot/freeldr/freeldr/fs/fat.c
Deleted: trunk/reactos/boot/freeldr/freeldr/fs/fat.h
Modified: trunk/reactos/boot/freeldr/freeldr/fs/fs.c
Modified: trunk/reactos/boot/freeldr/freeldr/fs/fsrec.c
Modified: trunk/reactos/boot/freeldr/freeldr/fs/iso.c
Deleted: trunk/reactos/boot/freeldr/freeldr/fs/iso.h
Modified: trunk/reactos/boot/freeldr/freeldr/fs/ntfs.c
Deleted: trunk/reactos/boot/freeldr/freeldr/fs/ntfs.h
Added: trunk/reactos/boot/freeldr/freeldr/include/arch/
Added: trunk/reactos/boot/freeldr/freeldr/include/arch/i386/
Added: trunk/reactos/boot/freeldr/freeldr/include/arch/i386/hardware.h
Added: trunk/reactos/boot/freeldr/freeldr/include/arch/i386/i386.h
Added: trunk/reactos/boot/freeldr/freeldr/include/arch/i386/machpc.h
Added: trunk/reactos/boot/freeldr/freeldr/include/arch/i386/machxbox.h
Modified: trunk/reactos/boot/freeldr/freeldr/include/cache.h
Modified: trunk/reactos/boot/freeldr/freeldr/include/freeldr.h
Added: trunk/reactos/boot/freeldr/freeldr/include/fs/
Added: trunk/reactos/boot/freeldr/freeldr/include/fs/ext2.h
Added: trunk/reactos/boot/freeldr/freeldr/include/fs/fat.h
Added: trunk/reactos/boot/freeldr/freeldr/include/fs/iso.h
Added: trunk/reactos/boot/freeldr/freeldr/include/fs/ntfs.h
Modified: trunk/reactos/boot/freeldr/freeldr/include/inifile.h
Modified: trunk/reactos/boot/freeldr/freeldr/include/mm.h
Added: trunk/reactos/boot/freeldr/freeldr/include/registry.h
Added: trunk/reactos/boot/freeldr/freeldr/include/ui/
Added: trunk/reactos/boot/freeldr/freeldr/include/ui/gui.h
Added: trunk/reactos/boot/freeldr/freeldr/include/ui/tui.h
Modified: trunk/reactos/boot/freeldr/freeldr/inffile/inffile.c
Deleted: trunk/reactos/boot/freeldr/freeldr/inifile/ini.h
Modified: trunk/reactos/boot/freeldr/freeldr/inifile/ini_init.c
Modified: trunk/reactos/boot/freeldr/freeldr/inifile/inifile.c
Modified: trunk/reactos/boot/freeldr/freeldr/inifile/parse.c
Modified: trunk/reactos/boot/freeldr/freeldr/linuxboot.c
Modified: trunk/reactos/boot/freeldr/freeldr/machine.c
Modified: trunk/reactos/boot/freeldr/freeldr/miscboot.c
Deleted: trunk/reactos/boot/freeldr/freeldr/mm/mem.h
Modified: trunk/reactos/boot/freeldr/freeldr/mm/meminit.c
Modified: trunk/reactos/boot/freeldr/freeldr/mm/mm.c
Modified: trunk/reactos/boot/freeldr/freeldr/options.c
Modified: trunk/reactos/boot/freeldr/freeldr/oslist.c
Modified: trunk/reactos/boot/freeldr/freeldr/reactos/arcname.c
Modified: trunk/reactos/boot/freeldr/freeldr/reactos/binhive.c
Modified: trunk/reactos/boot/freeldr/freeldr/reactos/loader.c
Modified: trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c
Modified: trunk/reactos/boot/freeldr/freeldr/reactos/registry.c
Deleted: trunk/reactos/boot/freeldr/freeldr/reactos/registry.h
Modified: trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c
Modified: trunk/reactos/boot/freeldr/freeldr/rtl/list.c
Modified: trunk/reactos/boot/freeldr/freeldr/rtl/print.c
Modified: trunk/reactos/boot/freeldr/freeldr/rtl/stdlib.c
Modified: trunk/reactos/boot/freeldr/freeldr/rtl/string.c
Modified: trunk/reactos/boot/freeldr/freeldr/ui/gui.c
Deleted: trunk/reactos/boot/freeldr/freeldr/ui/gui.h
Modified: trunk/reactos/boot/freeldr/freeldr/ui/tui.c
Deleted: trunk/reactos/boot/freeldr/freeldr/ui/tui.h
Modified: trunk/reactos/boot/freeldr/freeldr/ui/tuimenu.c
Modified: trunk/reactos/boot/freeldr/freeldr/ui/ui.c
Modified: trunk/reactos/boot/freeldr/freeldr/version.c
[truncated at 100 lines; 5 more skipped] 
  _____  

Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/archmach.c
--- trunk/reactos/boot/freeldr/freeldr/arch/i386/archmach.c
2005-11-13 04:34:41 UTC (rev 19189)
+++ trunk/reactos/boot/freeldr/freeldr/arch/i386/archmach.c
2005-11-13 04:50:55 UTC (rev 19190)
@@ -17,14 +17,7 @@

  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include "freeldr.h"
-#include "mm.h"
-#include "machine.h"
-#include "machpc.h"
-#include "machxbox.h"
-#include "portio.h"
-#include "hardware.h"
-#include "rtl.h"
+#include <freeldr.h>
 
 VOID
 MachInit(const char *CmdLine)
  _____  

Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c
--- trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c
2005-11-13 04:34:41 UTC (rev 19189)
+++ trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c
2005-11-13 04:50:55 UTC (rev 19190)
@@ -19,20 +19,10 @@

  */
 
 #include <freeldr.h>
-#include <arch.h>
-#include <rtl.h>
+
+#define NDEBUG
 #include <debug.h>
-#include <disk.h>
-#include <mm.h>
-#include <machine.h>
-#include <portio.h>
-#include <video.h>
 
-#include "../../reactos/registry.h"
-#include "hardware.h"
-#include "machpc.h"
-
-
 #define MILLISEC     (10)
 #define PRECISION    (8)
 
  _____  

Deleted: trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.h
--- trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.h
2005-11-13 04:34:41 UTC (rev 19189)
+++ trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.h
2005-11-13 04:50:55 UTC (rev 19190)
@@ -1,99 +0,0 @@

-/*
- *  FreeLoader
- *
- *  Copyright (C) 2003  Eric Kohl
- *
- *  This program is free software; you can redistribute it and/or
modify
- *  it under the terms of the GNU General Public License as published
by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program 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 General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#ifndef __I386_HARDWARE_H_
-#define __I386_HARDWARE_H_
-
-#ifndef __REGISTRY_H
-#include "../../reactos/registry.h"
-#endif
-
-/* CM_PARTIAL_RESOURCE_DESCRIPTOR.Flags */
-#define CM_RESOURCE_PORT_MEMORY               0x0000
-#define CM_RESOURCE_PORT_IO                   0x0001
-
-#define CM_RESOURCE_INTERRUPT_LEVEL_SENSITIVE 0x0000
-#define CM_RESOURCE_INTERRUPT_LATCHED         0x0001
-
-typedef struct _CM_COMPONENT_INFORMATION
-{
-  ULONG Flags;
-  ULONG Version;
-  ULONG Key;
-  ULONG Affinity;
-} __attribute__((packed)) CM_COMPONENT_INFORMATION,
*PCM_COMPONENT_INFORMATION;
-
-
-/* CM_COMPONENT_INFORMATION.Flags */
-#define Failed      0x00000001
-#define ReadOnly    0x00000002
-#define Removable   0x00000004
-#define ConsoleIn   0x00000008
-#define ConsoleOut  0x00000010
-#define Input       0x00000020
-#define Output      0x00000040
-
-#define CONFIG_CMD(bus, dev_fn, where) \
-	(0x80000000 | (((ULONG)(bus)) << 16) | (((dev_fn) & 0x1F) << 11)
| (((dev_fn) & 0xE0) << 3) | ((where) & ~3))
-
-/* PROTOTYPES
***************************************************************/
-
-/* hardware.c */
-
-VOID StallExecutionProcessor(ULONG Microseconds);
-
-VOID HalpCalibrateStallExecution(VOID);
-
-VOID SetComponentInformation(FRLDRHKEY ComponentKey,
-			     ULONG Flags,
-			     ULONG Key,
-			     ULONG Affinity);
-
-/* hwacpi.c */
-VOID DetectAcpiBios(FRLDRHKEY SystemKey, ULONG *BusNumber);
-
-/* hwapm.c */
-VOID DetectApmBios(FRLDRHKEY SystemKey, ULONG *BusNumber);
-
-/* hwcpu.c */
-VOID DetectCPUs(FRLDRHKEY SystemKey);
-
-/* hwpci.c */
-VOID DetectPciBios(FRLDRHKEY SystemKey, ULONG *BusNumber);
-
-/* i386cpu.S */
-ULONG CpuidSupported(VOID);
-VOID GetCpuid(ULONG Level,
-	      ULONG *eax,
-	      ULONG *ebx,
-	      ULONG *ecx,
-	      ULONG *edx);
-ULONGLONG RDTSC(VOID);
-
-/* i386pnp.S */
-ULONG PnpBiosSupported(VOID);
-ULONG PnpBiosGetDeviceNodeCount(ULONG *NodeSize,
-			      ULONG *NodeCount);
-ULONG PnpBiosGetDeviceNode(UCHAR *NodeId,
-			 UCHAR *NodeBuffer);
-
-#endif /* __I386_HARDWARE_H_ */
-
-/* EOF */
  _____  

Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hwacpi.c
--- trunk/reactos/boot/freeldr/freeldr/arch/i386/hwacpi.c
2005-11-13 04:34:41 UTC (rev 19189)
+++ trunk/reactos/boot/freeldr/freeldr/arch/i386/hwacpi.c
2005-11-13 04:50:55 UTC (rev 19190)
@@ -19,15 +19,10 @@

  */
 
 #include <freeldr.h>
-#include <arch.h>
-#include <rtl.h>
+
+#define NDEBUG
 #include <debug.h>
-#include <mm.h>
-#include <portio.h>
 
-#include "../../reactos/registry.h"
-#include "hardware.h"
-
 BOOLEAN AcpiPresent = FALSE;
 
 static BOOL
  _____  

Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hwapm.c
--- trunk/reactos/boot/freeldr/freeldr/arch/i386/hwapm.c
2005-11-13 04:34:41 UTC (rev 19189)
+++ trunk/reactos/boot/freeldr/freeldr/arch/i386/hwapm.c
2005-11-13 04:50:55 UTC (rev 19190)
@@ -19,16 +19,10 @@

  */
 
 #include <freeldr.h>
-#include <arch.h>
-#include <rtl.h>
+
+#define NDEBUG
 #include <debug.h>
-#include <mm.h>
-#include <portio.h>
 
-#include "../../reactos/registry.h"
-#include "hardware.h"
-
-
 static BOOL
 FindApmBios(VOID)
 {
  _____  

Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hwcpu.c
--- trunk/reactos/boot/freeldr/freeldr/arch/i386/hwcpu.c
2005-11-13 04:34:41 UTC (rev 19189)
+++ trunk/reactos/boot/freeldr/freeldr/arch/i386/hwcpu.c
2005-11-13 04:50:55 UTC (rev 19190)
@@ -19,16 +19,10 @@

  */
 
 #include <freeldr.h>
-#include <arch.h>
-#include <rtl.h>
+
+#define NDEBUG
 #include <debug.h>
-#include <mm.h>
-#include <portio.h>
 
-#include "../../reactos/registry.h"
-#include "hardware.h"
-
-
 #define MP_FP_SIGNATURE 0x5F504D5F	/* "_MP_" */
 #define MP_CT_SIGNATURE 0x504D4350	/* "PCMP" */
 
  _____  

Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hwpci.c
--- trunk/reactos/boot/freeldr/freeldr/arch/i386/hwpci.c
2005-11-13 04:34:41 UTC (rev 19189)
+++ trunk/reactos/boot/freeldr/freeldr/arch/i386/hwpci.c
2005-11-13 04:50:55 UTC (rev 19190)
@@ -19,15 +19,10 @@

  */
 
 #include <freeldr.h>
-#include <arch.h>
-#include <rtl.h>
+
+#define NDEBUG
 #include <debug.h>
-#include <mm.h>
-#include <portio.h>
 
-#include "../../reactos/registry.h"
-#include "hardware.h"
-
 typedef struct _ROUTING_SLOT
 {
   UCHAR  BusNumber;
  _____  

Deleted: trunk/reactos/boot/freeldr/freeldr/arch/i386/i386.h
--- trunk/reactos/boot/freeldr/freeldr/arch/i386/i386.h	2005-11-13
04:34:41 UTC (rev 19189)
+++ trunk/reactos/boot/freeldr/freeldr/arch/i386/i386.h	2005-11-13
04:50:55 UTC (rev 19190)
@@ -1,41 +0,0 @@

-/*
- *  FreeLoader
- *
- *  Copyright (C) 2003  Eric Kohl
- *
- *  This program is free software; you can redistribute it and/or
modify
- *  it under the terms of the GNU General Public License as published
by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program 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 General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#ifndef __I386_I386_H_
-#define __I386_I386_H_
-
-
-extern ULONG i386BootDrive;
-extern ULONG i386BootPartition;
-
-extern BOOL i386DiskGetBootVolume(PULONG DriveNumber, PULONGLONG
StartSector,
-                                  PULONGLONG SectorCount, int *FsType);
-extern BOOL i386DiskGetSystemVolume(char *SystemPath, char
*RemainingPath,
-                                    PULONG Device, PULONG DriveNumber,
-                                    PULONGLONG StartSector,
-                                    PULONGLONG SectorCount, int
*FsType);
-extern BOOL i386DiskGetBootPath(char *BootPath, unsigned Size);
-extern VOID i386DiskGetBootDevice(PULONG BootDevice);
-extern BOOL i386DiskBootingFromFloppy(VOID);
-extern BOOL i386DiskNormalizeSystemPath(char *SystemPath, unsigned
Size);
-
-#endif /* __I386_I386_H_ */
-
-/* EOF */
  _____  

Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/i386disk.c
--- trunk/reactos/boot/freeldr/freeldr/arch/i386/i386disk.c
2005-11-13 04:34:41 UTC (rev 19189)
+++ trunk/reactos/boot/freeldr/freeldr/arch/i386/i386disk.c
2005-11-13 04:50:55 UTC (rev 19190)
@@ -17,11 +17,11 @@

  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include "freeldr.h"
-#include "debug.h"
-#include "i386.h"
-#include "fsrec.h"
+#include <freeldr.h>
 
+#define NDEBUG
+#include <debug.h>
+
 
////////////////////////////////////////////////////////////////////////
/////////////////////
 // FUNCTIONS
 
////////////////////////////////////////////////////////////////////////
/////////////////////
  _____  

Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/i386vid.c
--- trunk/reactos/boot/freeldr/freeldr/arch/i386/i386vid.c
2005-11-13 04:34:41 UTC (rev 19189)
+++ trunk/reactos/boot/freeldr/freeldr/arch/i386/i386vid.c
2005-11-13 04:50:55 UTC (rev 19190)
@@ -20,12 +20,9 @@

  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-
 #include <freeldr.h>
-#include <arch.h>
-#include <video.h>
-#include <portio.h>
-#include <rtl.h>
+
+#define NDEBUG
 #include <debug.h>
 
 typedef struct
  _____  

Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/machpc.c
--- trunk/reactos/boot/freeldr/freeldr/arch/i386/machpc.c
2005-11-13 04:34:41 UTC (rev 19189)
+++ trunk/reactos/boot/freeldr/freeldr/arch/i386/machpc.c
2005-11-13 04:50:55 UTC (rev 19190)
@@ -17,13 +17,7 @@

  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include "freeldr.h"
-#include "mm.h"
-#include "arch.h"
-#include "machine.h"
-#include "machpc.h"
-#include "rtl.h"
-#include "i386.h"
+#include <freeldr.h>
 
 VOID
 PcMachInit(const char *CmdLine)
  _____  

Deleted: trunk/reactos/boot/freeldr/freeldr/arch/i386/machpc.h
--- trunk/reactos/boot/freeldr/freeldr/arch/i386/machpc.h
2005-11-13 04:34:41 UTC (rev 19189)
+++ trunk/reactos/boot/freeldr/freeldr/arch/i386/machpc.h
2005-11-13 04:50:55 UTC (rev 19190)
@@ -1,62 +0,0 @@

-/* $Id$
- *
- *  FreeLoader
- *
- *  Copyright (C) 2003  Eric Kohl
- *
- *  This program is free software; you can redistribute it and/or
modify
- *  it under the terms of the GNU General Public License as published
by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program 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 General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#ifndef __I386_MACHPC_H_
-#define __I386_MACHPC_H_
-
-#ifndef __MEMORY_H
-#include "mm.h"
-#endif
-
-VOID PcMachInit(const char *CmdLine);
-
-VOID PcConsPutChar(int Ch);
-BOOL PcConsKbHit();
-int PcConsGetCh();
-
-VOID PcVideoClearScreen(UCHAR Attr);
-VIDEODISPLAYMODE PcVideoSetDisplayMode(char *DisplayMode, BOOL Init);
-VOID PcVideoGetDisplaySize(PULONG Width, PULONG Height, PULONG Depth);
-ULONG PcVideoGetBufferSize(VOID);
-VOID PcVideoSetTextCursorPosition(ULONG X, ULONG Y);
-VOID PcVideoHideShowTextCursor(BOOL Show);
-VOID PcVideoPutChar(int Ch, UCHAR Attr, unsigned X, unsigned Y);
-VOID PcVideoCopyOffScreenBufferToVRAM(PVOID Buffer);
-BOOL PcVideoIsPaletteFixed(VOID);
-VOID PcVideoSetPaletteColor(UCHAR Color, UCHAR Red, UCHAR Green, UCHAR
Blue);
-VOID PcVideoGetPaletteColor(UCHAR Color, UCHAR* Red, UCHAR* Green,
UCHAR* Blue);
-VOID PcVideoSync(VOID);
-VOID PcVideoPrepareForReactOS(VOID);
-
-ULONG PcMemGetMemoryMap(PBIOS_MEMORY_MAP BiosMemoryMap, ULONG
MaxMemoryMapSize);
-
-BOOL PcDiskReadLogicalSectors(ULONG DriveNumber, ULONGLONG
SectorNumber, ULONG SectorCount, PVOID Buffer);
-BOOL PcDiskGetPartitionEntry(ULONG DriveNumber, ULONG PartitionNumber,
PPARTITION_TABLE_ENTRY PartitionTableEntry);
-BOOL PcDiskGetDriveGeometry(ULONG DriveNumber, PGEOMETRY
DriveGeometry);
-ULONG PcDiskGetCacheableBlockCount(ULONG DriveNumber);
-
-VOID PcRTCGetCurrentDateTime(PULONG Year, PULONG Month, PULONG Day,
PULONG Hour, PULONG Minute, PULONG Second);
-
-VOID PcHwDetect(VOID);
-
-#endif /* __I386_MACHPC_H_ */
-
-/* EOF */
  _____  

Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/machxbox.c
--- trunk/reactos/boot/freeldr/freeldr/arch/i386/machxbox.c
2005-11-13 04:34:41 UTC (rev 19189)
+++ trunk/reactos/boot/freeldr/freeldr/arch/i386/machxbox.c
2005-11-13 04:50:55 UTC (rev 19190)
@@ -17,11 +17,7 @@

  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include "freeldr.h"
-#include "mm.h"
-#include "machine.h"
-#include "machxbox.h"
-#include "i386.h"
+#include <freeldr.h>
 
 VOID
 XboxMachInit(const char *CmdLine)
  _____  

Deleted: trunk/reactos/boot/freeldr/freeldr/arch/i386/machxbox.h
--- trunk/reactos/boot/freeldr/freeldr/arch/i386/machxbox.h
2005-11-13 04:34:41 UTC (rev 19189)
+++ trunk/reactos/boot/freeldr/freeldr/arch/i386/machxbox.h
2005-11-13 04:50:55 UTC (rev 19190)
@@ -1,65 +0,0 @@

-/* $Id$
- *
- *  FreeLoader
- *
- *  This program is free software; you can redistribute it and/or
modify
- *  it under the terms of the GNU General Public License as published
by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program 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 General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#ifndef __I386_MACHXBOX_H_
-#define __I386_MACHXBOX_H_
-
-#ifndef __MEMORY_H
-#include "mm.h"
-#endif
-
-UCHAR XboxFont8x16[256 * 16];
-
-VOID XboxMachInit(const char *CmdLine);
-
-VOID XboxConsPutChar(int Ch);
-BOOL XboxConsKbHit();
-int XboxConsGetCh();
-
-VOID XboxVideoInit(VOID);
-VOID XboxVideoClearScreen(UCHAR Attr);
-VIDEODISPLAYMODE XboxVideoSetDisplayMode(char *DisplayModem, BOOL
Init);
-VOID XboxVideoGetDisplaySize(PULONG Width, PULONG Height, PULONG
Depth);
-ULONG XboxVideoGetBufferSize(VOID);
-VOID XboxVideoSetTextCursorPosition(ULONG X, ULONG Y);
-VOID XboxVideoHideShowTextCursor(BOOL Show);
-VOID XboxVideoPutChar(int Ch, UCHAR Attr, unsigned X, unsigned Y);
-VOID XboxVideoCopyOffScreenBufferToVRAM(PVOID Buffer);
-BOOL XboxVideoIsPaletteFixed(VOID);
-VOID XboxVideoSetPaletteColor(UCHAR Color, UCHAR Red, UCHAR Green,
UCHAR Blue);
-VOID XboxVideoGetPaletteColor(UCHAR Color, UCHAR* Red, UCHAR* Green,
UCHAR* Blue);
-VOID XboxVideoSync(VOID);
-VOID XboxVideoPrepareForReactOS(VOID);
-
-VOID XboxMemInit(VOID);
-PVOID XboxMemReserveMemory(ULONG MbToReserve);
-ULONG XboxMemGetMemoryMap(PBIOS_MEMORY_MAP BiosMemoryMap, ULONG
MaxMemoryMapSize);
-
-BOOL XboxDiskReadLogicalSectors(ULONG DriveNumber, ULONGLONG
SectorNumber, ULONG SectorCount, PVOID Buffer);
-BOOL XboxDiskGetPartitionEntry(ULONG DriveNumber, ULONG
PartitionNumber, PPARTITION_TABLE_ENTRY PartitionTableEntry);
-BOOL XboxDiskGetDriveGeometry(ULONG DriveNumber, PGEOMETRY
DriveGeometry);
-ULONG XboxDiskGetCacheableBlockCount(ULONG DriveNumber);
-
-VOID XboxRTCGetCurrentDateTime(PULONG Year, PULONG Month, PULONG Day,
PULONG Hour, PULONG Minute, PULONG Second);
-
-VOID XboxHwDetect(VOID);
-
-#endif /* __I386_HWXBOX_H_ */
-
-/* EOF */
  _____  

Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/pccons.c
--- trunk/reactos/boot/freeldr/freeldr/arch/i386/pccons.c
2005-11-13 04:34:41 UTC (rev 19189)
+++ trunk/reactos/boot/freeldr/freeldr/arch/i386/pccons.c
2005-11-13 04:50:55 UTC (rev 19190)
@@ -17,12 +17,7 @@

  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include "freeldr.h"
-#include "machine.h"
-#include "arch.h"
-#include "debug.h"
-#include "machpc.h"
-#include "rtl.h"
+#include <freeldr.h>
 
 #define TEXTMODE_BUFFER      0xb8000
 #define TEXTMODE_BUFFER_SIZE 0x8000
  _____  

Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/pcdisk.c
--- trunk/reactos/boot/freeldr/freeldr/arch/i386/pcdisk.c
2005-11-13 04:34:41 UTC (rev 19189)
+++ trunk/reactos/boot/freeldr/freeldr/arch/i386/pcdisk.c
2005-11-13 04:50:55 UTC (rev 19190)
@@ -17,15 +17,10 @@

  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include "freeldr.h"
-#include "disk.h"
-#include "rtl.h"
-#include "arch.h"
-#include "debug.h"
-#include "portio.h"
-#include "machine.h"
-#include "machpc.h"
+#include <freeldr.h>
 
+#define NDEBUG
+#include <debug.h>
 
 typedef struct
 {
  _____  

Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/pcmem.c
--- trunk/reactos/boot/freeldr/freeldr/arch/i386/pcmem.c
2005-11-13 04:34:41 UTC (rev 19189)
+++ trunk/reactos/boot/freeldr/freeldr/arch/i386/pcmem.c
2005-11-13 04:50:55 UTC (rev 19190)
@@ -20,14 +20,11 @@

  *       was Copyright (C) 1998-2003 Brian Palmer &lt;brianp(a)sginet.com&gt;
  */
 
-#include "freeldr.h"
-#include "arch.h"
-#include "debug.h"
-#include "machine.h"
-#include "machpc.h"
-#include "portio.h"
-#include "rtl.h"
+#include <freeldr.h>
 
+#define NDEBUG
+#include <debug.h>
+
 static ULONG
 PcMemGetExtendedMemorySize(VOID)
 {
  _____  

Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/pcrtc.c
--- trunk/reactos/boot/freeldr/freeldr/arch/i386/pcrtc.c
2005-11-13 04:34:41 UTC (rev 19189)
+++ trunk/reactos/boot/freeldr/freeldr/arch/i386/pcrtc.c
2005-11-13 04:50:55 UTC (rev 19190)
@@ -17,10 +17,7 @@

  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include "freeldr.h"
-#include "arch.h"
-#include "machine.h"
-#include "machpc.h"
+#include <freeldr.h>
 
 #define BCD_INT(bcd) (((bcd & 0xf0) >> 4) * 10 + (bcd &0x0f))
 
  _____  

Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/pcvideo.c
--- trunk/reactos/boot/freeldr/freeldr/arch/i386/pcvideo.c
2005-11-13 04:34:41 UTC (rev 19189)
+++ trunk/reactos/boot/freeldr/freeldr/arch/i386/pcvideo.c
2005-11-13 04:50:55 UTC (rev 19190)
@@ -17,14 +17,11 @@

  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include "freeldr.h"
-#include "machine.h"
-#include "arch.h"
-#include "debug.h"
-#include "machpc.h"
-#include "rtl.h"
-#include "portio.h"
+#include <freeldr.h>
 
+#define NDEBUG
+#include <debug.h>
+
 #define VIDEOPORT_PALETTE_READ		0x03C7
 #define VIDEOPORT_PALETTE_WRITE		0x03C8
 #define VIDEOPORT_PALETTE_DATA		0x03C9
  _____  

Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxcons.c
--- trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxcons.c
2005-11-13 04:34:41 UTC (rev 19189)
+++ trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxcons.c
2005-11-13 04:50:55 UTC (rev 19190)
@@ -17,9 +17,7 @@

  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include "freeldr.h"
-#include "machine.h"
-#include "machxbox.h"
+#include <freeldr.h>
 
 static unsigned CurrentCursorX = 0;
 static unsigned CurrentCursorY = 0;
  _____  

Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxdisk.c
--- trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxdisk.c
2005-11-13 04:34:41 UTC (rev 19189)
+++ trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxdisk.c
2005-11-13 04:50:55 UTC (rev 19190)
@@ -22,14 +22,11 @@

  *
  */
 
-#include "freeldr.h"
-#include "debug.h"
-#include "hardware.h"
-#include "machine.h"
-#include "machxbox.h"
-#include "portio.h"
-#include "rtl.h"
+#include <freeldr.h>
 
+#define NDEBUG
+#include <debug.h>
+
 #define XBOX_IDE_COMMAND_PORT 0x1f0
 #define XBOX_IDE_CONTROL_PORT 0x170
 
  _____  

Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxfont.c
--- trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxfont.c
2005-11-13 04:34:41 UTC (rev 19189)
+++ trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxfont.c
2005-11-13 04:50:55 UTC (rev 19190)
@@ -19,9 +19,7 @@

  * Note: Converted from the XFree vga.bdf font
  */
 
-#include "freeldr.h"
-#include "machine.h"
-#include "machxbox.h"
+#include <freeldr.h>
 
 UCHAR XboxFont8x16[256 * 16] =
 {
  _____  

Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxhw.c
--- trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxhw.c
2005-11-13 04:34:41 UTC (rev 19189)
+++ trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxhw.c
2005-11-13 04:50:55 UTC (rev 19190)
@@ -17,9 +17,7 @@

  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include "freeldr.h"
-#include "machine.h"
-#include "machxbox.h"
+#include <freeldr.h>
 
 VOID
 XboxHwDetect(VOID)
  _____  

Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxmem.c
--- trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxmem.c
2005-11-13 04:34:41 UTC (rev 19189)
+++ trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxmem.c
2005-11-13 04:50:55 UTC (rev 19190)
@@ -20,14 +20,7 @@

  * by the Xbox Linux group: http://www.xbox-linux.org
  */
 
-#include "freeldr.h"
-#include "debug.h"
-#include "mm.h"
-#include "rtl.h"
-#include "hardware.h"
-#include "machine.h"
-#include "machxbox.h"
-#include "portio.h"
+#include <freeldr.h>
 
 static ULONG InstalledMemoryMb = 0;
 static ULONG AvailableMemoryMb = 0;
  _____  

Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxrtc.c
--- trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxrtc.c
2005-11-13 04:34:41 UTC (rev 19189)
+++ trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxrtc.c
2005-11-13 04:50:55 UTC (rev 19190)
@@ -17,10 +17,7 @@

  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include "freeldr.h"
-#include "machine.h"
-#include "machxbox.h"
-#include "portio.h"
+#include <freeldr.h>
 
 #define RTC_REGISTER_A   0x0A
 #define   RTC_REG_A_UIP  0x80  /* Update In Progress bit */
  _____  

Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxvideo.c
--- trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxvideo.c
2005-11-13 04:34:41 UTC (rev 19189)
+++ trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxvideo.c
2005-11-13 04:50:55 UTC (rev 19190)
@@ -20,12 +20,7 @@

  * by the Xbox Linux group: http://www.xbox-linux.org
  */
 
-#include "freeldr.h"
-#include "debug.h"
-#include "rtl.h"
-#include "machine.h"
-#include "machxbox.h"
-#include "portio.h"
+#include <freeldr.h>
 
 #define I2C_IO_BASE 0xc000
 
  _____  

Modified: trunk/reactos/boot/freeldr/freeldr/bootmgr.c
--- trunk/reactos/boot/freeldr/freeldr/bootmgr.c	2005-11-13
04:34:41 UTC (rev 19189)
+++ trunk/reactos/boot/freeldr/freeldr/bootmgr.c	2005-11-13
04:50:55 UTC (rev 19190)
@@ -18,24 +18,6 @@

  */
 
 #include <freeldr.h>
-#include <rtl.h>
-#include <fs.h>
-#include <reactos.h>
-#include <ui.h>
-#include <arch.h>
-#include <miscboot.h>
-#include <linux.h>
-#include <mm.h>
-#include <inifile.h>
-#include <debug.h>
-#include <options.h>
-#include <oslist.h>
-#include <video.h>
-#include <bootmgr.h>
-#include <drivemap.h>
-#include <keycodes.h>
-#include <cmdline.h>
-#include <machine.h>
 
 VOID RunLoader(VOID)
 {
  _____  

Modified: trunk/reactos/boot/freeldr/freeldr/cache/blocklist.c
--- trunk/reactos/boot/freeldr/freeldr/cache/blocklist.c
2005-11-13 04:34:41 UTC (rev 19189)
+++ trunk/reactos/boot/freeldr/freeldr/cache/blocklist.c
2005-11-13 04:50:55 UTC (rev 19190)
@@ -17,15 +17,10 @@

  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-
 #include <freeldr.h>
-#include "cm.h"
-#include <mm.h>
-#include <disk.h>
-#include <rtl.h>
+
+#define NDEBUG
 #include <debug.h>
-#include <arch.h>
-#include <machine.h>
 
 // Returns a pointer to a CACHE_BLOCK structure
 // Adds the block to the cache manager block list
  _____  

Modified: trunk/reactos/boot/freeldr/freeldr/cache/cache.c
--- trunk/reactos/boot/freeldr/freeldr/cache/cache.c	2005-11-13
04:34:41 UTC (rev 19189)
+++ trunk/reactos/boot/freeldr/freeldr/cache/cache.c	2005-11-13
04:50:55 UTC (rev 19190)
@@ -17,14 +17,9 @@

  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-
 #include <freeldr.h>
-#include "cm.h"
-#include <mm.h>
-#include <disk.h>
-#include <machine.h>
-#include <cache.h>
-#include <rtl.h>
+
+#define NDEBUG
 #include <debug.h>
 
 
////////////////////////////////////////////////////////////////////////
///////////////
  _____  

Deleted: trunk/reactos/boot/freeldr/freeldr/cache/cm.h
--- trunk/reactos/boot/freeldr/freeldr/cache/cm.h	2005-11-13
04:34:41 UTC (rev 19189)
+++ trunk/reactos/boot/freeldr/freeldr/cache/cm.h	2005-11-13
04:50:55 UTC (rev 19190)
@@ -1,92 +0,0 @@

-/*
- *  FreeLoader
- *  Copyright (C) 1998-2003  Brian Palmer  &lt;brianp(a)sginet.com&gt;
- *
- *  This program is free software; you can redistribute it and/or
modify
- *  it under the terms of the GNU General Public License as published
by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program 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 General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-
-#include <freeldr.h>
-#include <rtl.h>
-#include <disk.h>
-
-#ifndef __CM_H
-#define __CM_H
-
-///////////////////////////////////////////////////////////////////////
////////////////
-//
-// This structure describes a cached block element. The disk is divided
up into
-// cache blocks. For disks which LBA is not supported each block is the
size of
-// one track. This will force the cache manager to make track sized
reads, and
-// therefore maximizes throughput. For disks which support LBA the
block size
-// is 64k because they have no cylinder, head, or sector boundaries.
-//
-///////////////////////////////////////////////////////////////////////
////////////////
-typedef struct
-{
-	LIST_ITEM	ListEntry;
// Doubly linked list synchronization member
-
-	ULONG			BlockNumber;
// Track index for CHS, 64k block index for LBA
-	BOOL		LockedInCache;				//
Indicates that this block is locked in cache memory
-	ULONG			AccessCount;
// Access count for this block
-
-	PVOID		BlockData;
// Pointer to block data
-
-} CACHE_BLOCK, *PCACHE_BLOCK;
-
-///////////////////////////////////////////////////////////////////////
////////////////
-//
-// This structure describes a cached drive. It contains the BIOS drive
number
-// and indicates whether or not LBA is supported. If LBA is not
supported then
-// the drive's geometry is described here.
-//
-///////////////////////////////////////////////////////////////////////
////////////////
-typedef struct
-{
-	ULONG			DriveNumber;
-	ULONG			BytesPerSector;
-
-	ULONG			BlockSize;			// Block
size (in sectors)
-	PCACHE_BLOCK		CacheBlockHead;
-
-} CACHE_DRIVE, *PCACHE_DRIVE;
-
-
-///////////////////////////////////////////////////////////////////////
////////////////
-//
-// Internal data
-//
-///////////////////////////////////////////////////////////////////////
////////////////
-extern	CACHE_DRIVE		CacheManagerDrive;
-extern	BOOL			CacheManagerInitialized;
-extern	ULONG				CacheBlockCount;
-extern	ULONG				CacheSizeLimit;
-extern	ULONG				CacheSizeCurrent;
-
-///////////////////////////////////////////////////////////////////////
////////////////
-//
-// Internal functions
-//
-///////////////////////////////////////////////////////////////////////
////////////////
-PCACHE_BLOCK	CacheInternalGetBlockPointer(PCACHE_DRIVE CacheDrive,
ULONG BlockNumber);				// Returns a pointer to
a CACHE_BLOCK structure given a block number
-PCACHE_BLOCK	CacheInternalFindBlock(PCACHE_DRIVE CacheDrive, ULONG
BlockNumber);					// Searches the block
list for a particular block
-PCACHE_BLOCK	CacheInternalAddBlockToCache(PCACHE_DRIVE CacheDrive,
ULONG BlockNumber);				// Adds a block to the
cache's block list
-BOOL			CacheInternalFreeBlock(PCACHE_DRIVE CacheDrive);
// Removes a block from the cache's block list & frees the memory
-VOID			CacheInternalCheckCacheSizeLimits(PCACHE_DRIVE
CacheDrive);							//
Checks the cache size limits to see if we can add a new block, if not
calls CacheInternalFreeBlock()
-VOID			CacheInternalDumpBlockList(PCACHE_DRIVE
CacheDrive);
// Dumps the list of cached blocks to the debug output port
-VOID			CacheInternalOptimizeBlockList(PCACHE_DRIVE
CacheDrive, PCACHE_BLOCK CacheBlock);	// Moves the specified block to
the head of the list
-
-
-#endif // defined __CM_H
  _____  

Modified: trunk/reactos/boot/freeldr/freeldr/cmdline.c
--- trunk/reactos/boot/freeldr/freeldr/cmdline.c	2005-11-13
04:34:41 UTC (rev 19189)
+++ trunk/reactos/boot/freeldr/freeldr/cmdline.c	2005-11-13
04:50:55 UTC (rev 19190)
@@ -19,8 +19,6 @@

  */
 
 #include <freeldr.h>
-#include <cmdline.h>
-#include <rtl.h>
 
 static CMDLINEINFO CmdLineInfo;
 
  _____  

Modified: trunk/reactos/boot/freeldr/freeldr/comm/rs232.c
--- trunk/reactos/boot/freeldr/freeldr/comm/rs232.c	2005-11-13
04:34:41 UTC (rev 19189)
+++ trunk/reactos/boot/freeldr/freeldr/comm/rs232.c	2005-11-13
04:50:55 UTC (rev 19190)
@@ -20,10 +20,7 @@

  */
 
 #include <freeldr.h>
-#include <comm.h>
-#include <portio.h>
 
-
 /* MACROS
*******************************************************************/
 
 #define DEFAULT_BAUD_RATE    19200
  _____  

Modified: trunk/reactos/boot/freeldr/freeldr/custom.c
--- trunk/reactos/boot/freeldr/freeldr/custom.c	2005-11-13 04:34:41 UTC
(rev 19189)
+++ trunk/reactos/boot/freeldr/freeldr/custom.c	2005-11-13 04:50:55 UTC
(rev 19190)
@@ -18,18 +18,6 @@

  */
 
 #include <freeldr.h>
-#include <rtl.h>
-#include <ui.h>
-#include <options.h>
-#include <miscboot.h>
-#include <debug.h>
-#include <disk.h>
-#include <arch.h>
-#include <inifile.h>
-#include <linux.h>
-#include <reactos.h>
-#include <drivemap.h>
-#include <machine.h>
 
 
 const CHAR	BootDrivePrompt[] = "Enter the boot
drive.\n\nExamples:\nfd0 - first floppy drive\nhd0 - first hard
drive\nhd1 - second hard drive\ncd0 - first CD-ROM drive.\n\nBIOS drive
numbers may also be used:\n0 - first floppy drive\n0x80 - first hard
drive\n0x81 - second hard drive";
  _____  

Modified: trunk/reactos/boot/freeldr/freeldr/debug.c
--- trunk/reactos/boot/freeldr/freeldr/debug.c	2005-11-13 04:34:41 UTC
(rev 19189)
+++ trunk/reactos/boot/freeldr/freeldr/debug.c	2005-11-13 04:50:55 UTC
(rev 19190)
@@ -18,11 +18,6 @@

  */
 
 #include <freeldr.h>
-#include <debug.h>
-#include <rtl.h>
-#include <comm.h>
-#include <portio.h>
-#include <machine.h>
 
 #ifdef DEBUG
 
  _____  

Modified: trunk/reactos/boot/freeldr/freeldr/disk/disk.c
--- trunk/reactos/boot/freeldr/freeldr/disk/disk.c	2005-11-13
04:34:41 UTC (rev 19189)
+++ trunk/reactos/boot/freeldr/freeldr/disk/disk.c	2005-11-13
04:50:55 UTC (rev 19190)
@@ -18,13 +18,10 @@

  */
 
 #include <freeldr.h>
-#include <disk.h>
-#include <arch.h>
-#include <rtl.h>
-#include <ui.h>
+
+#define NDEBUG
 #include <debug.h>
 
-
 #undef  UNIMPLEMENTED
 #define UNIMPLEMENTED   BugCheck((DPRINT_WARNING, "Unimplemented\n"));
 
  _____  

Modified: trunk/reactos/boot/freeldr/freeldr/disk/partition.c
--- trunk/reactos/boot/freeldr/freeldr/disk/partition.c	2005-11-13
04:34:41 UTC (rev 19189)
+++ trunk/reactos/boot/freeldr/freeldr/disk/partition.c	2005-11-13
04:50:55 UTC (rev 19190)
@@ -18,14 +18,10 @@

  */
 
 #include <freeldr.h>
-#include <disk.h>
-#include <rtl.h>
-#include <mm.h>
+
+#define NDEBUG
 #include <debug.h>
-#include <arch.h>
-#include <machine.h>
 
-
 BOOL DiskGetActivePartitionEntry(ULONG DriveNumber,
                                  PPARTITION_TABLE_ENTRY
PartitionTableEntry,
[truncated at 1000 lines; 3005 more skipped]