diff --git a/reactos/include/ddk/cmtypes.h b/reactos/include/ddk/cmtypes.h
index e1c1ac42d9e..33346103ea4 100644
--- a/reactos/include/ddk/cmtypes.h
+++ b/reactos/include/ddk/cmtypes.h
@@ -1,7 +1,7 @@
 #ifndef __INCLUDE_DDK_CMTYPES_H
 #define __INCLUDE_DDK_CMTYPES_H
 /*
- * Object Manager structures and typedefs
+ * Configuration Manager structures and typedefs
  */
 
 /*
@@ -99,4 +99,5 @@ typedef struct _KEY_VALUE_ENTRY
   ULONG  Type;
 } KEY_VALUE_ENTRY, *PKEY_VALUE_ENTRY;
 
+
 #endif /* __INCLUDE_DDK_CMTYPES_H */
diff --git a/reactos/include/ddk/haltypes.h b/reactos/include/ddk/haltypes.h
index e4c9cb9c84c..b13069f0f99 100644
--- a/reactos/include/ddk/haltypes.h
+++ b/reactos/include/ddk/haltypes.h
@@ -1,4 +1,4 @@
-/* $Id: haltypes.h,v 1.9 2003/02/26 14:11:41 ekohl Exp $
+/* $Id: haltypes.h,v 1.10 2003/04/27 18:08:56 ekohl Exp $
  *
  * COPYRIGHT:                See COPYING in the top level directory
  * PROJECT:                  ReactOS kernel
@@ -260,18 +260,6 @@ typedef struct _PCI_SLOT_NUMBER
 } PCI_SLOT_NUMBER, *PPCI_SLOT_NUMBER;
 
 
-/* MicroChannel bus data */
-
-typedef struct _CM_MCA_POS_DATA
-{
-  USHORT AdapterId;
-  UCHAR PosData1;
-  UCHAR PosData2;
-  UCHAR PosData3;
-  UCHAR PosData4;
-} CM_MCA_POS_DATA, *PCM_MCA_POS_DATA;
-
-
 /* Hal dispatch table */
 
 typedef enum _HAL_QUERY_INFORMATION_CLASS
diff --git a/reactos/include/ddk/iotypes.h b/reactos/include/ddk/iotypes.h
index b72d1399d28..56c6977f4dc 100644
--- a/reactos/include/ddk/iotypes.h
+++ b/reactos/include/ddk/iotypes.h
@@ -1,4 +1,4 @@
-/* $Id: iotypes.h,v 1.46 2003/03/19 23:14:29 gdalsnes Exp $
+/* $Id: iotypes.h,v 1.47 2003/04/27 18:08:56 ekohl Exp $
  *
  */
 
@@ -194,6 +194,42 @@ typedef struct _IO_RESOURCE_REQUIREMENTS_LIST
    IO_RESOURCE_LIST List[1];
 } IO_RESOURCE_REQUIREMENTS_LIST, *PIO_RESOURCE_REQUIREMENTS_LIST;
 
+
+/* MicroChannel bus data */
+
+typedef struct _CM_MCA_POS_DATA
+{
+  USHORT AdapterId;
+  UCHAR PosData1;
+  UCHAR PosData2;
+  UCHAR PosData3;
+  UCHAR PosData4;
+} CM_MCA_POS_DATA, *PCM_MCA_POS_DATA;
+
+
+/* Int13 drive geometry data */
+
+typedef struct _CM_INT13_DRIVE_PARAMETER
+{
+  USHORT DriveSelect;
+  ULONG MaxCylinders;
+  USHORT SectorsPerTrack;
+  USHORT MaxHeads;
+  USHORT NumberDrives;
+} CM_INT13_DRIVE_PARAMETER, *PCM_INT13_DRIVE_PARAMETER;
+
+
+/* Extended drive geometry data */
+
+typedef struct _CM_DISK_GEOMETRY_DEVICE_DATA
+{
+  ULONG BytesPerSector;
+  ULONG NumberOfCylinders;
+  ULONG SectorsPerTrack;
+  ULONG NumberOfHeads;
+} CM_DISK_GEOMETRY_DEVICE_DATA, *PCM_DISK_GEOMETRY_DEVICE_DATA;
+
+
 typedef struct
 {
    UCHAR Type;
@@ -245,7 +281,7 @@ typedef struct
    INTERFACE_TYPE InterfaceType;
    ULONG BusNumber;
    CM_PARTIAL_RESOURCE_LIST PartialResourceList;
-} __attribute__((packed)) CM_FULL_RESOURCE_DESCRIPTOR;
+} __attribute__((packed)) CM_FULL_RESOURCE_DESCRIPTOR, *PCM_FULL_RESOURCE_DESCRIPTOR;
 
 typedef struct
 {