diff --git a/reactos/boot/freeldr/freeldr/arch/archwsup.c b/reactos/boot/freeldr/freeldr/arch/archwsup.c
index bbe1d2aca7e..71fad44f459 100644
--- a/reactos/boot/freeldr/freeldr/arch/archwsup.c
+++ b/reactos/boot/freeldr/freeldr/arch/archwsup.c
@@ -16,6 +16,11 @@
 
 PCONFIGURATION_COMPONENT_DATA FldrArcHwTreeRoot;
 
+// ARC Disk Information
+ARC_DISK_SIGNATURE reactos_arc_disk_info[32];
+ULONG reactos_disk_count = 0;
+CHAR reactos_arc_strings[32][256];
+
 /* FUNCTIONS ******************************************************************/
 
 #define TAG_HW_COMPONENT_DATA 'DCwH'
diff --git a/reactos/boot/freeldr/freeldr/arch/i386/halstub.c b/reactos/boot/freeldr/freeldr/arch/i386/halstub.c
index 9db6410a7b8..2bcff89969a 100644
--- a/reactos/boot/freeldr/freeldr/arch/i386/halstub.c
+++ b/reactos/boot/freeldr/freeldr/arch/i386/halstub.c
@@ -1,10 +1,10 @@
 /*
-* PROJECT:         ReactOS Kernel
-* LICENSE:         GPL - See COPYING in the top level directory
-* FILE:            boot/freeldr/freeldr/arch/i386/halstub.c
-* PURPOSE:         I/O Stub HAL Routines
-* PROGRAMMERS:     Alex Ionescu (alex.ionescu@reactos.org)
-*/
+ * PROJECT:         ReactOS Kernel
+ * LICENSE:         GPL - See COPYING in the top level directory
+ * FILE:            boot/freeldr/freeldr/arch/i386/halstub.c
+ * PURPOSE:         I/O Stub HAL Routines
+ * PROGRAMMERS:     Alex Ionescu (alex.ionescu@reactos.org)
+ */
 
 /* INCLUDES ******************************************************************/
 
diff --git a/reactos/boot/freeldr/freeldr/arch/i386/ntoskrnl.c b/reactos/boot/freeldr/freeldr/arch/i386/ntoskrnl.c
index ba09d9bc6be..3c30cad41ce 100644
--- a/reactos/boot/freeldr/freeldr/arch/i386/ntoskrnl.c
+++ b/reactos/boot/freeldr/freeldr/arch/i386/ntoskrnl.c
@@ -1,3 +1,13 @@
+/*
+ * PROJECT:         ReactOS Kernel
+ * LICENSE:         GPL - See COPYING in the top level directory
+ * FILE:            boot/freeldr/freeldr/arch/i386/ntoskrnl.c
+ * PURPOSE:         NTOS glue routines for the MINIHAL library
+ * PROGRAMMERS:     Hervé Poussineau  <hpoussin@reactos.org>
+ */
+
+/* INCLUDES ******************************************************************/
+
 #include <ntoskrnl.h>
 
 /* For KeStallExecutionProcessor */
@@ -5,6 +15,8 @@
 #include <arch/pc/pcbios.h>
 #endif
 
+/* FUNCTIONS *****************************************************************/
+
 VOID
 NTAPI
 KeInitializeEvent(
@@ -37,7 +49,6 @@ KeSetTimeIncrement(
 {
 }
 
-NTKERNELAPI
 VOID
 FASTCALL
 IoAssignDriveLetters(
@@ -48,7 +59,6 @@ IoAssignDriveLetters(
 {
 }
 
-NTKERNELAPI
 NTSTATUS
 FASTCALL
 IoSetPartitionInformation(
@@ -60,7 +70,18 @@ IoSetPartitionInformation(
     return STATUS_NOT_IMPLEMENTED;
 }
 
-NTKERNELAPI
+/*
+ * NTSTATUS
+ * FASTCALL
+ * IoReadPartitionTable(
+ *     IN PDEVICE_OBJECT DeviceObject,
+ *     IN ULONG SectorSize,
+ *     IN BOOLEAN ReturnRecognizedPartitions,
+ *     OUT PDRIVE_LAYOUT_INFORMATION *PartitionBuffer);
+ *
+ * See boot/freeldr/freeldr/disk/partition.c
+ */
+
 NTSTATUS
 FASTCALL
 IoWritePartitionTable(
@@ -68,12 +89,11 @@ IoWritePartitionTable(
     IN ULONG SectorSize,
     IN ULONG SectorsPerTrack,
     IN ULONG NumberOfHeads,
-    IN struct _DRIVE_LAYOUT_INFORMATION *PartitionBuffer)
+    IN PDRIVE_LAYOUT_INFORMATION PartitionBuffer)
 {
     return STATUS_NOT_IMPLEMENTED;
 }
 
-NTHALAPI
 VOID
 NTAPI
 KeStallExecutionProcessor(
diff --git a/reactos/boot/freeldr/freeldr/bootmgr.c b/reactos/boot/freeldr/freeldr/bootmgr.c
index fbe49838ab8..cba68a43efa 100644
--- a/reactos/boot/freeldr/freeldr/bootmgr.c
+++ b/reactos/boot/freeldr/freeldr/bootmgr.c
@@ -24,11 +24,6 @@
 
 /* GLOBALS ********************************************************************/
 
-// ARC Disk Information
-ARC_DISK_SIGNATURE reactos_arc_disk_info[32];
-ULONG reactos_disk_count = 0;
-CHAR reactos_arc_strings[32][256];
-
 typedef
 VOID
 (*OS_LOADING_METHOD)(IN OperatingSystemItem* OperatingSystem,
diff --git a/reactos/boot/freeldr/freeldr/include/disk.h b/reactos/boot/freeldr/freeldr/include/disk.h
index dce72fe93e0..1e0e0b02f83 100644
--- a/reactos/boot/freeldr/freeldr/include/disk.h
+++ b/reactos/boot/freeldr/freeldr/include/disk.h
@@ -89,6 +89,7 @@ typedef struct _MASTER_BOOT_RECORD
 #define PARTITION_EXTENDED              0x05      // Extended partition entry
 #define PARTITION_HUGE                  0x06      // Huge partition MS-DOS V4
 #define PARTITION_IFS                   0x07      // IFS Partition
+#define PARTITION_OS2BOOTMGR            0x0A      // OS/2 Boot Manager/OPUS/Coherent swap
 #define PARTITION_FAT32                 0x0B      // FAT32
 #define PARTITION_FAT32_XINT13          0x0C      // FAT32 using extended int13 services
 #define PARTITION_XINT13                0x0E      // Win95 partition using extended int13 services
@@ -97,6 +98,12 @@ typedef struct _MASTER_BOOT_RECORD
 #define PARTITION_PREP                  0x41      // PowerPC Reference Platform (PReP) Boot Partition
 #define PARTITION_LDM                   0x42      // Logical Disk Manager partition
 #define PARTITION_UNIX                  0x63      // Unix
+#define VALID_NTFT                      0xC0      // NTFT uses high order bits
+#define PARTITION_NTFT                  0x80      // NTFT partition
+#ifdef __REACTOS__
+#define PARTITION_OLD_LINUX             0x43
+#define PARTITION_LINUX                 0x83
+#endif
 
 ///////////////////////////////////////////////////////////////////////////////////////
 //
diff --git a/reactos/boot/freeldr/freeldr/include/ntoskrnl.h b/reactos/boot/freeldr/freeldr/include/ntoskrnl.h
index a964a3b80c5..a514f133e79 100644
--- a/reactos/boot/freeldr/freeldr/include/ntoskrnl.h
+++ b/reactos/boot/freeldr/freeldr/include/ntoskrnl.h
@@ -1,3 +1,11 @@
+/*
+ * PROJECT:         ReactOS Kernel
+ * LICENSE:         GPL - See COPYING in the top level directory
+ * FILE:            boot/freeldr/freeldr/include/ntoskrnl.h
+ * PURPOSE:         NTOS glue routines for the MINIHAL library
+ * PROGRAMMERS:     Hervé Poussineau  <hpoussin@reactos.org>
+ */
+
 #include <ntdef.h>
 #undef _NTHAL_
 //#undef DECLSPEC_IMPORT