diff --git a/reactos/include/afd/shared.h b/reactos/include/afd/shared.h
index deda8eee6c4..26aa0d18f13 100644
--- a/reactos/include/afd/shared.h
+++ b/reactos/include/afd/shared.h
@@ -24,7 +24,7 @@ typedef struct _AFD_SOCKET_INFORMATION {
 
 /* AFD IOCTL code definitions */
 
-#define FSCTL_AFD_BASE     FILE_DEVICE_NAMED_PIPE // ???
+#define FSCTL_AFD_BASE     FILE_DEVICE_NAMED_PIPE /* ??? */
 
 #define AFD_CTL_CODE(Function, Method, Access) \
   CTL_CODE(FSCTL_AFD_BASE, Function, Method, Access)
diff --git a/reactos/include/base.h b/reactos/include/base.h
index 2c26838a733..f44ec5a80e4 100644
--- a/reactos/include/base.h
+++ b/reactos/include/base.h
@@ -146,7 +146,7 @@ typedef HANDLE HTASK;
 typedef HANDLE HWINEVENTHOOK;
 typedef VOID (CALLBACK* WINEVENTPROC)(HWINEVENTHOOK hWinEventHook,DWORD event,HWND hwnd,LONG idObject,LONG idChild,DWORD idEventThread,DWORD dwmsEventTime);
 typedef unsigned short LANGID;
-//typedef DWORD LCID;
+/*typedef DWORD LCID; */
 typedef DWORD LCTYPE;
 /* typedef LOCALHANDLE */
 typedef unsigned short *LP;
diff --git a/reactos/include/coff.h b/reactos/include/coff.h
index 4e467d38197..80cdcd74f93 100644
--- a/reactos/include/coff.h
+++ b/reactos/include/coff.h
@@ -6,11 +6,11 @@
 extern "C" {
 #endif
 
-//#ifndef __dj_ENFORCE_ANSI_FREESTANDING
-
-//#ifndef __STRICT_ANSI__
-
-//#ifndef _POSIX_SOURCE
+/*
+ * #ifndef __dj_ENFORCE_ANSI_FREESTANDING
+ * #ifndef __STRICT_ANSI__
+ * #ifndef _POSIX_SOURCE
+ */
 
 /*** coff information for Intel 386/486.  */
 
@@ -325,10 +325,11 @@ struct external_reloc {
 /* For new sections we havn't heard of before */
 #define DEFAULT_SECTION_ALIGNMENT 4
 
-//#endif /* !_POSIX_SOURCE */
-//#endif /* !__STRICT_ANSI__ */
-//#endif /* !__dj_ENFORCE_ANSI_FREESTANDING */
-
+/*
+ * #endif /* !_POSIX_SOURCE */
+ * #endif /* !__STRICT_ANSI__ */
+ * #endif /* !__dj_ENFORCE_ANSI_FREESTANDING */
+ */
 #ifndef __dj_ENFORCE_FUNCTION_CALLS
 #endif /* !__dj_ENFORCE_FUNCTION_CALLS */
 
diff --git a/reactos/include/csrss/csrss.h b/reactos/include/csrss/csrss.h
index 04af5b82911..25d2c81151f 100644
--- a/reactos/include/csrss/csrss.h
+++ b/reactos/include/csrss/csrss.h
@@ -52,7 +52,7 @@ typedef struct
 {
    HANDLE ConsoleHandle;
    WORD NrCharactersToRead;
-   WORD nCharsCanBeDeleted;     // number of chars already in buffer that can be backspaced
+   WORD nCharsCanBeDeleted;     /* number of chars already in buffer that can be backspaced */
 } CSRSS_READ_CONSOLE_REQUEST, *PCSRSS_READ_CONSOLE_REQUEST;
 
 typedef struct
@@ -385,7 +385,7 @@ typedef struct
 typedef struct
 {
   HANDLE ConsoleHandle;
-  DWORD SetGet; // 0=get; 1=set
+  DWORD SetGet; /* 0=get; 1=set */
   DWORD State;
 
 } CSRSS_CONSOLE_HARDWARE_STATE, *PCSRSS_CONSOLE_HARDWARE_STATE;
@@ -411,7 +411,7 @@ typedef struct
 
 #define CSRSS_MAX_READ_CONSOLE_OUTPUT_ATTRIB  (MAX_MESSAGE_DATA - sizeof(ULONG) - sizeof(HANDLE) - sizeof(DWORD) - sizeof(CSRSS_READ_CONSOLE_OUTPUT_ATTRIB_REQUEST))
 
-// WCHARs, not bytes!
+/* WCHARs, not bytes! */
 #define CSRSS_MAX_TITLE_LENGTH          80
 
 #define CSRSS_CREATE_PROCESS                (0x0)
diff --git a/reactos/include/ddk/af_irda.h b/reactos/include/ddk/af_irda.h
index 0a6433f0d1e..87b485ddd6c 100644
--- a/reactos/include/ddk/af_irda.h
+++ b/reactos/include/ddk/af_irda.h
@@ -41,7 +41,7 @@ DEFINE_GUID(GUID_DEVINTERFACE_IRDAPORT,
   0x86e0d1e0L, 0x8089, 0x11d0, 0x9c, 0xe4, 0x08, 0x00, 0x3e, 0x30, 0x1f, 0x74);
 DEFINE_GUID(GUID_DEVINTERFACE_IRDAENUM_BUS_ENUMERATOR,
   0x4D36E978L, 0xE325, 0x11CE, 0xBF, 0xC1, 0x08, 0x00, 0x2B, 0xE1, 0x03, 0x19);
-#endif // DEFINE_GUID
+#endif /* DEFINE_GUID */
 
 #define WINDOWS_AF_IRDA 26
 #define WINDOWS_PF_IRDA WINDOWS_AF_IRDA
@@ -76,16 +76,16 @@ DEFINE_GUID(GUID_DEVINTERFACE_IRDAENUM_BUS_ENUMERATOR,
 #define IRLMP_9WIRE_MODE     ((ULONG)0x16)
 
 #if 0
-// Available/Used on Windows 98 only ???
+/* Available/Used on Windows 98 only ??? */
 #define IRLMP_TINYTP_MODE    ((ULONG)0x17)
 #define IRLMP_PARAMETERS     ((ULONG)0x18)
 #define IRLMP_DISCOVERY_MODE ((ULONG)0x19)
-// Available/Used on Windows CE only ???
+/* Available/Used on Windows CE only ??? */
 #define IRLMP_SHARP_MODE     ((ULONG)0x20)
 #endif
 
 enum {
-// First hint byte
+/* First hint byte */
   LM_HB1_PnP =         0x01,
   LM_HB1_PDA_Palmtop = 0x02,
   LM_HB1_Computer =    0x04,
@@ -93,10 +93,10 @@ enum {
   LM_HB1_Modem =       0x10,
   LM_HB1_Fax =         0x20,
   LM_HB1_LANAccess =   0x40,
-// Second hint byte
+/* Second hint byte */
   LM_HB2_Telephony =   0x01,
   LM_HB2_FileServer =  0x02,
-// Any hint byte
+/* Any hint byte */
   LM_HB_Extension =    0x80,
 };
 
@@ -123,17 +123,17 @@ enum {
 #define  LM_BAUD_1152K  1152000
 #define  LM_BAUD_4M     4000000
 
-#if 0 // Available/Used on Windows 98 only ???
+#if 0 /* Available/Used on Windows 98 only ??? */
 typedef ULONG LM_BAUD_RATE;
 typedef struct {
-    ULONG        nTXDataBytes;  // packet transmit receive bytes
-    ULONG        nRXDataBytes;  // packet maximum receive bytes
-    LM_BAUD_RATE nBaudRate;     // link negotiated baud
-    ULONG        thresholdTime; // milliseconds for threshold time
-    ULONG        discTime;      // milliseconds for disconnect time
-    USHORT       nMSLinkTurn;   // milliseconds for link turn around time
-    UCHAR        nTXPackets;    // transmit window packets
-    UCHAR        nRXPackets;    // receive window packets
+    ULONG        nTXDataBytes;  /* packet transmit receive bytes */
+    ULONG        nRXDataBytes;  /* packet maximum receive bytes */
+    LM_BAUD_RATE nBaudRate;     /* link negotiated baud */
+    ULONG        thresholdTime; /* milliseconds for threshold time */
+    ULONG        discTime;      /* milliseconds for disconnect time
+    USHORT       nMSLinkTurn;   /* milliseconds for link turn around time */
+    UCHAR        nTXPackets;    /* transmit window packets */
+    UCHAR        nRXPackets;    /* receive window packets */
 } LM_IRPARMS;
 typedef LM_IRPARMS *PLM_IRPARMS;
 #endif
diff --git a/reactos/include/ddk/exfuncs.h b/reactos/include/ddk/exfuncs.h
index 552d550c6ac..a678ea3a526 100644
--- a/reactos/include/ddk/exfuncs.h
+++ b/reactos/include/ddk/exfuncs.h
@@ -441,7 +441,7 @@ ExIsResourceAcquiredExclusiveLite (
 	PERESOURCE	Resource
 	);
 
-// was ULONG
+/* was ULONG */
 USHORT
 STDCALL
 ExIsResourceAcquiredSharedLite (
diff --git a/reactos/include/ddk/extypes.h b/reactos/include/ddk/extypes.h
index 3990e9cf170..f5608657949 100644
--- a/reactos/include/ddk/extypes.h
+++ b/reactos/include/ddk/extypes.h
@@ -1,4 +1,4 @@
-/* $Id: extypes.h,v 1.19 2003/08/14 18:30:27 silverblade Exp $ */
+/* $Id: extypes.h,v 1.20 2003/08/25 01:37:47 sedwards Exp $ */
 
 #ifndef __INCLUDE_DDK_EXTYPES_H
 #define __INCLUDE_DDK_EXTYPES_H
@@ -27,7 +27,7 @@ typedef struct _OWNER_ENTRY
      {
 	LONG OwnerCount;
 	ULONG TableSize;
-     }; // anon
+     }; /* anon */
 } OWNER_ENTRY, *POWNER_ENTRY;
 
 typedef struct _ERESOURCE
@@ -46,7 +46,7 @@ typedef struct _ERESOURCE
      {
 	PVOID Address;
 	ULONG CreatorBackTraceIndex;
-     }; // anon
+     }; /* anon */
    KSPIN_LOCK SpinLock;
 } ERESOURCE, *PERESOURCE;
 
@@ -70,8 +70,8 @@ typedef struct _ZONE_HEADER
 
 typedef struct _ZONE_SEGMENT_HEADER
 {
-   SINGLE_LIST_ENTRY SegmentList; // was Entry
-   PVOID Reserved;  // was ULONG Size;
+   SINGLE_LIST_ENTRY SegmentList; /* was Entry */
+   PVOID Reserved;  /* was ULONG Size; */
 } ZONE_SEGMENT_HEADER, *PZONE_SEGMENT_HEADER;
 
 
@@ -80,7 +80,7 @@ typedef VOID STDCALL_FUNC
 (*PWORKER_THREAD_ROUTINE)(PVOID Parameter);
 
 
-// Modified by Andrew Greenwood, 16th July 2003:
+/* Modified by Andrew Greenwood, 16th July 2003: */
 
 typedef struct _WORK_QUEUE_ITEM
 {
@@ -105,7 +105,7 @@ typedef union _SLIST_HEADER
 	SINGLE_LIST_ENTRY Next;
 	USHORT Depth;
 	USHORT Sequence;	
-     }; // now anonymous
+     }; /* now anonymous */
 } SLIST_HEADER, *PSLIST_HEADER;
 
 typedef struct _NPAGED_LOOKASIDE_LIST
diff --git a/reactos/include/ddk/halfuncs.h b/reactos/include/ddk/halfuncs.h
index 42a050e3e1b..1e0bde5c060 100644
--- a/reactos/include/ddk/halfuncs.h
+++ b/reactos/include/ddk/halfuncs.h
@@ -1,6 +1,6 @@
 #ifndef __INCLUDE_DDK_HALFUNCS_H
 #define __INCLUDE_DDK_HALFUNCS_H
-/* $Id: halfuncs.h,v 1.10 2003/07/17 16:57:38 silverblade Exp $ */
+/* $Id: halfuncs.h,v 1.11 2003/08/25 01:37:47 sedwards Exp $ */
 
 #include <ntos/haltypes.h>
 
@@ -97,11 +97,13 @@ HalGetBusDataByOffset(BUS_DATA_TYPE BusDataType,
 		      ULONG Offset,
 		      ULONG Length);
 
-/* Is this function really exported ?? */
-//ULONG
-//HalGetDmaAlignmentRequirement(VOID);
-// NTOSAPI
-// DDKAPI
+/* Is this function really exported ??
+ULONG
+HalGetDmaAlignmentRequirement(VOID);
+NTOSAPI
+DDKAPI
+*/
+
 ULONG STDCALL
 HalGetDmaAlignmentRequirement( 
   VOID);
diff --git a/reactos/include/ddk/ioctrl.h b/reactos/include/ddk/ioctrl.h
index ac0e36db0e0..09eee8f66d2 100644
--- a/reactos/include/ddk/ioctrl.h
+++ b/reactos/include/ddk/ioctrl.h
@@ -5,17 +5,17 @@
 #define CTL_CODE(Dev, Func, Meth, Acc) ( ((Dev)<<16) | ((Acc)<<14) | ((Func)<<2) | (Meth))
 
 
-//#define DEVICE_TYPE_FROM_CTL_CODE(ctlCode) (((ULONG)(ctlCode&0xffff0000))>>16)
-//#define IO_METHOD_FROM_CTL_CODE(ctlCode) (ctlCode&0x00000003)
+/*#define DEVICE_TYPE_FROM_CTL_CODE(ctlCode) (((ULONG)(ctlCode&0xffff0000))>>16) */
+/*#define IO_METHOD_FROM_CTL_CODE(ctlCode) (ctlCode&0x00000003) */
 
 
-//  IOCTL Parameter buffering methods
+/*  IOCTL Parameter buffering methods */
 #define METHOD_BUFFERED    0
 #define METHOD_IN_DIRECT   1
 #define METHOD_OUT_DIRECT  2
 #define METHOD_NEITHER     3
 
-//  IOCTL File access type
+/*  IOCTL File access type */
 #define FILE_ANY_ACCESS    0
 #define FILE_READ_ACCESS   1
 #define FILE_WRITE_ACCESS  2
diff --git a/reactos/include/ddk/iotypes.h b/reactos/include/ddk/iotypes.h
index 420c02b979c..1db08280dc0 100644
--- a/reactos/include/ddk/iotypes.h
+++ b/reactos/include/ddk/iotypes.h
@@ -1,4 +1,4 @@
-/* $Id: iotypes.h,v 1.52 2003/08/14 18:30:27 silverblade Exp $
+/* $Id: iotypes.h,v 1.53 2003/08/25 01:37:47 sedwards Exp $
  *
  */
 
@@ -24,7 +24,7 @@ extern POBJECT_TYPE IMPORTED IoFileObjectType;
 #endif
 
 
-// from winddk.h
+/* from winddk.h */
 #define POINTER_ALIGNMENT
 
 
diff --git a/reactos/include/ddk/kefuncs.h b/reactos/include/ddk/kefuncs.h
index 9e65e9e4a4f..c4d8d408ff7 100644
--- a/reactos/include/ddk/kefuncs.h
+++ b/reactos/include/ddk/kefuncs.h
@@ -413,10 +413,10 @@ KeWaitForSingleObject (
 
 
 
-// io permission map has a 8k size
-// Each bit in the IOPM corresponds to an io port byte address. The bitmap
-// is initialized to allow IO at any port. [ all bits set ]. 
-
+/* io permission map has a 8k size
+ * Each bit in the IOPM corresponds to an io port byte address. The bitmap
+ * is initialized to allow IO at any port. [ all bits set ]. 
+ */
 typedef struct _IOPM
 {
 	UCHAR Bitmap[8192];
diff --git a/reactos/include/ddk/ketypes.h b/reactos/include/ddk/ketypes.h
index 16cdaa035e5..c0066f0fa0f 100644
--- a/reactos/include/ddk/ketypes.h
+++ b/reactos/include/ddk/ketypes.h
@@ -3,7 +3,7 @@
 #ifndef __INCLUDE_DDK_KETYPES_H
 #define __INCLUDE_DDK_KETYPES_H
 
-// include ntos/ketypes.h here?
+/* include ntos/ketypes.h here? */
 
 struct _KMUTANT;
 
@@ -219,6 +219,6 @@ typedef LONG FLOAT_LONG, *PFLOAT_LONG;
 
 typedef LONG FLOATL;
 
-typedef LONG FIX; // fixed-point number
+typedef LONG FIX; /* fixed-point number */
 
 #endif /* __INCLUDE_DDK_KETYPES_H */
diff --git a/reactos/include/ddk/ntddblue.h b/reactos/include/ddk/ntddblue.h
index dd13642fc4d..818a989297d 100644
--- a/reactos/include/ddk/ntddblue.h
+++ b/reactos/include/ddk/ntddblue.h
@@ -54,9 +54,9 @@ typedef struct _OUTPUT_CHARACTER
 
 typedef struct _CONSOLE_DRAW
 {
-	SHORT	X;		// Origin
+	SHORT	X;		/* Origin */
 	SHORT	Y;
-	SHORT	SizeX;		// Size of the screen buffer
+	SHORT	SizeX;		/* Size of the screen buffer */
 	SHORT	SizeY;
 } CONSOLE_DRAW, *PCONSOLE_DRAW;
 
diff --git a/reactos/include/ddk/ntddkbd.h b/reactos/include/ddk/ntddkbd.h
index fa903f35dc9..328045e5eee 100644
--- a/reactos/include/ddk/ntddkbd.h
+++ b/reactos/include/ddk/ntddkbd.h
@@ -36,10 +36,10 @@ extern "C" {
 
 typedef struct _KEYBOARD_INPUT_DATA {
 
-    //
-    // Unit number.  E.g., for \Device\KeyboardPort0 the unit is '0',
-    // for \Device\KeyboardPort1 the unit is '1', and so on.
-    //
+    /*
+     * Unit number.  E.g., for \Device\KeyboardPort0 the unit is '0',
+     * for \Device\KeyboardPort1 the unit is '1', and so on.
+     */
 
     USHORT UnitId;
     USHORT MakeCode;
diff --git a/reactos/include/ddk/ntddmou.h b/reactos/include/ddk/ntddmou.h
index f64067e78cf..b99bf4caab3 100644
--- a/reactos/include/ddk/ntddmou.h
+++ b/reactos/include/ddk/ntddmou.h
@@ -1,4 +1,4 @@
-// Mouse definitions common to both mouse class and port drivers
+/* Mouse definitions common to both mouse class and port drivers */
 
 #define IO_MOUSE_INCREMENT	6
 #define MOUSE_BUFFER_SIZE	32
diff --git a/reactos/include/ddk/pnptypes.h b/reactos/include/ddk/pnptypes.h
index b402bae6c42..3de24d76c3d 100644
--- a/reactos/include/ddk/pnptypes.h
+++ b/reactos/include/ddk/pnptypes.h
@@ -4,7 +4,7 @@
 struct _DEVICE_OBJECT;
 struct _FILE_OBJECT;
 
-// windows.h may be included before
+/* windows.h may be included before */
 #ifndef _GUID_DEFINED
 #define _GUID_DEFINED
 
@@ -58,9 +58,9 @@ typedef struct _DEVICE_INTERFACE_CHANGE_NOTIFICATION {
   USHORT Version;
   USHORT Size;
   GUID Event;
-  //
-  // Event-specific data
-  //
+  /*
+   * Event-specific data
+   */
   GUID InterfaceClassGuid;
   PUNICODE_STRING SymbolicLinkName;
 } DEVICE_INTERFACE_CHANGE_NOTIFICATION, *PDEVICE_INTERFACE_CHANGE_NOTIFICATION;
@@ -69,9 +69,9 @@ typedef struct _HWPROFILE_CHANGE_NOTIFICATION {
   USHORT Version;
   USHORT Size;
   GUID Event;
-  //
-  // (No event-specific data)
-  //
+  /*
+   * (No event-specific data)
+   */
 } HWPROFILE_CHANGE_NOTIFICATION, *PHWPROFILE_CHANGE_NOTIFICATION;
 
 typedef struct _PLUGPLAY_NOTIFICATION_HEADER {
@@ -93,9 +93,9 @@ typedef struct _TARGET_DEVICE_CUSTOM_NOTIFICATION {
   USHORT Version;
   USHORT Size;
   GUID Event;
-  //
-  // Event-specific data
-  //
+  /*
+   * Event-specific data
+   */
   struct _FILE_OBJECT *FileObject;
   LONG NameBufferOffset;
   UCHAR CustomDataBuffer[1];
@@ -105,14 +105,14 @@ typedef struct _TARGET_DEVICE_REMOVAL_NOTIFICATION {
   USHORT Version;
   USHORT Size;
   GUID Event;
-  //
-  // Event-specific data
-  //
+  /*
+   * Event-specific data
+   */
   struct _FILE_OBJECT *FileObject;
 } TARGET_DEVICE_REMOVAL_NOTIFICATION, *PTARGET_DEVICE_REMOVAL_NOTIFICATION;
 
 
-// PnP Device Property for IoGetDeviceProperty
+/* PnP Device Property for IoGetDeviceProperty */
 typedef enum {
   DevicePropertyDeviceDescription,
   DevicePropertyHardwareID,
@@ -134,12 +134,12 @@ typedef enum {
   DevicePropertyUINumber
 } DEVICE_REGISTRY_PROPERTY;
 
-// DevInstKeyType values for IoOpenDeviceRegistryKey
+/* DevInstKeyType values for IoOpenDeviceRegistryKey */
 #define PLUGPLAY_REGKEY_DEVICE              1
 #define PLUGPLAY_REGKEY_DRIVER              2
 #define PLUGPLAY_REGKEY_CURRENT_HWPROFILE   4
 
-// EventCategory for IoRegisterPlugPlayNotification
+/* EventCategory for IoRegisterPlugPlayNotification */
 typedef enum _IO_NOTIFICATION_EVENT_CATEGORY {
   EventCategoryReserved,
   EventCategoryHardwareProfileChange,
@@ -147,18 +147,18 @@ typedef enum _IO_NOTIFICATION_EVENT_CATEGORY {
   EventCategoryTargetDeviceChange
 } IO_NOTIFICATION_EVENT_CATEGORY;
 
-// CallbackRoutine for IoRegisterPlugPlayNotification
+/* CallbackRoutine for IoRegisterPlugPlayNotification */
 typedef NTSTATUS STDCALL_FUNC
 (*PDRIVER_NOTIFICATION_CALLBACK_ROUTINE)(
   IN PVOID NotificationStructure,
   IN PVOID Context);
 
-// Callback for IoReportTargetDeviceChangeAsynchronous
+/* Callback for IoReportTargetDeviceChangeAsynchronous */
 typedef VOID STDCALL_FUNC
 (*PDEVICE_CHANGE_COMPLETE_CALLBACK)(
   IN PVOID Context);
 
-// PNP/POWER values for IRP_MJ_PNP/IRP_MJ_POWER
+/* PNP/POWER values for IRP_MJ_PNP/IRP_MJ_POWER */
 typedef enum _DEVICE_RELATION_TYPE {
   BusRelations,
   EjectionRelations,
diff --git a/reactos/include/ddk/potypes.h b/reactos/include/ddk/potypes.h
index 06ede748daa..0b02bc3b689 100644
--- a/reactos/include/ddk/potypes.h
+++ b/reactos/include/ddk/potypes.h
@@ -4,7 +4,7 @@
 struct _DEVICE_OBJECT;
 struct _IO_STATUS_BLOCK;
 
-// Flags for PoSetSystemState
+/* Flags for PoSetSystemState */
 typedef ULONG EXECUTION_STATE;
 
 #define ES_SYSTEM_REQUIRED  ((EXECUTION_STATE)0x00000001)
@@ -12,7 +12,7 @@ typedef ULONG EXECUTION_STATE;
 #define ES_USER_PRESENT     ((EXECUTION_STATE)0x00000004)
 #define ES_CONTINUOUS       ((EXECUTION_STATE)0x80000000)
 
-// PowerState for PoRequestPowerIrp
+/* PowerState for PoRequestPowerIrp */
 typedef enum _SYSTEM_POWER_STATE {
   PowerSystemUnspecified = 0,
   PowerSystemWorking,
@@ -24,7 +24,7 @@ typedef enum _SYSTEM_POWER_STATE {
   PowerSystemMaximum
 } SYSTEM_POWER_STATE, *PSYSTEM_POWER_STATE;
 
-// Values for IRP_MN_QUERY_POWER/IRP_MN_SET_POWER
+/* Values for IRP_MN_QUERY_POWER/IRP_MN_SET_POWER */
 typedef enum {
   PowerActionNone = 0,
   PowerActionReserved,
@@ -36,7 +36,7 @@ typedef enum {
   PowerActionWarmEject
 } POWER_ACTION, *PPOWER_ACTION;
 
-// State for PoRegisterDeviceForIdleDetection
+/* State for PoRegisterDeviceForIdleDetection */
 typedef enum _DEVICE_POWER_STATE {
   PowerDeviceUnspecified = 0,
   PowerDeviceD0,
@@ -46,19 +46,19 @@ typedef enum _DEVICE_POWER_STATE {
   PowerDeviceMaximum
 } DEVICE_POWER_STATE, *PDEVICE_POWER_STATE;
 
-// State for PoSetPowerState
+/* State for PoSetPowerState */
 typedef union _POWER_STATE {
   SYSTEM_POWER_STATE SystemState;
   DEVICE_POWER_STATE DeviceState;
 } POWER_STATE, *PPOWER_STATE;
 
-// Type for PoSetPowerState
+/* Type for PoSetPowerState */
 typedef enum _POWER_STATE_TYPE {
   SystemPowerState = 0,
   DevicePowerState
 } POWER_STATE_TYPE, *PPOWER_STATE_TYPE;
 
-// CompletionFunction for PoRequestPowerIrp
+/* CompletionFunction for PoRequestPowerIrp */
 typedef VOID STDCALL_FUNC
 (*PREQUEST_POWER_COMPLETE) (
   IN struct _DEVICE_OBJECT *DeviceObject,
diff --git a/reactos/include/ddk/psfuncs.h b/reactos/include/ddk/psfuncs.h
index 52e6a5c2a85..42d1e7be99a 100644
--- a/reactos/include/ddk/psfuncs.h
+++ b/reactos/include/ddk/psfuncs.h
@@ -1,4 +1,4 @@
-/* $Id: psfuncs.h,v 1.25 2003/07/24 18:14:59 royce Exp $
+/* $Id: psfuncs.h,v 1.26 2003/08/25 01:37:47 sedwards Exp $
  */
 #ifndef _INCLUDE_DDK_PSFUNCS_H
 #define _INCLUDE_DDK_PSFUNCS_H
@@ -82,11 +82,11 @@ NTSTATUS STDCALL PsLookupProcessByProcessId(IN PVOID ProcessId,
 NTSTATUS STDCALL PsLookupProcessThreadByCid(IN PCLIENT_ID Cid,
 					    OUT PEPROCESS *Process OPTIONAL,
 					    OUT struct _ETHREAD **Thread);
-//					    OUT PETHREAD *Thread);
+					 /* OUT PETHREAD *Thread); */
 
 NTSTATUS STDCALL PsLookupThreadByThreadId(IN PVOID ThreadId,
 					  OUT struct _ETHREAD **Thread);
-//					  OUT PETHREAD *Thread);
+					/* OUT PETHREAD *Thread); */
 
 NTSTATUS STDCALL
 PsSetCreateProcessNotifyRoutine(IN PCREATE_PROCESS_NOTIFY_ROUTINE NotifyRoutine,
diff --git a/reactos/include/ddk/scsi.h b/reactos/include/ddk/scsi.h
index 7e408fe52df..a1b963ff876 100644
--- a/reactos/include/ddk/scsi.h
+++ b/reactos/include/ddk/scsi.h
@@ -1,4 +1,4 @@
-/* $Id: scsi.h,v 1.3 2003/06/24 12:39:08 ekohl Exp $
+/* $Id: scsi.h,v 1.4 2003/08/25 01:37:47 sedwards Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel
@@ -559,26 +559,26 @@ typedef union _CDB
 #define SCSIOP_MECHANISM_STATUS    0xBD
 #define SCSIOP_READ_CD             0xBE
 
-//
-// If the IMMED bit is 1, status is returned as soon
-// as the operation is initiated. If the IMMED bit
-// is 0, status is not returned until the operation
-// is completed.
-//
+/*
+ * If the IMMED bit is 1, status is returned as soon
+ * as the operation is initiated. If the IMMED bit
+ * is 0, status is not returned until the operation
+ * is completed.
+ */
 
 #define CDB_RETURN_ON_COMPLETION   0
 #define CDB_RETURN_IMMEDIATE       1
 
 
-//
-// CDB Force media access used in extended read and write commands.
-//
+/*
+ * CDB Force media access used in extended read and write commands.
+ */
 
 #define CDB_FORCE_MEDIA_ACCESS 0x08
 
-//
-// Denon CD ROM operation codes
-//
+/*
+ * Denon CD ROM operation codes
+ */
 
 #define SCSIOP_DENON_EJECT_DISC    0xE6
 #define SCSIOP_DENON_STOP_AUDIO    0xE7
@@ -586,9 +586,9 @@ typedef union _CDB
 #define SCSIOP_DENON_READ_TOC      0xE9
 #define SCSIOP_DENON_READ_SUBCODE  0xEB
 
-//
-// SCSI Bus Messages
-//
+/*
+ * SCSI Bus Messages
+ */
 
 #define SCSIMESS_ABORT                0x06
 #define SCSIMESS_ABORT_WITH_TAG       0x0D
@@ -615,25 +615,25 @@ typedef union _CDB
 #define SCSIMESS_SAVE_DATA_POINTER    0X02
 #define SCSIMESS_TERMINATE_IO_PROCESS 0X11
 
-//
-// SCSI Extended Message operation codes
-//
+/*
+ * SCSI Extended Message operation codes
+ */
 
 #define SCSIMESS_MODIFY_DATA_POINTER  0X00
 #define SCSIMESS_SYNCHRONOUS_DATA_REQ 0X01
 #define SCSIMESS_WIDE_DATA_REQUEST    0X03
 
-//
-// SCSI Extended Message Lengths
-//
+/*
+ * SCSI Extended Message Lengths
+ */
 
 #define SCSIMESS_MODIFY_DATA_LENGTH   5
 #define SCSIMESS_SYNCH_DATA_LENGTH    3
 #define SCSIMESS_WIDE_DATA_LENGTH     2
 
-//
-// SCSI extended message structure
-//
+/*
+ * SCSI extended message structure
+ */
 
 #pragma pack (1)
 typedef struct _SCSI_EXTENDED_MESSAGE
@@ -675,16 +675,16 @@ typedef struct _SCSI_EXTENDED_MESSAGE
 #define SCSISTAT_COMMAND_TERMINATED    0x22
 #define SCSISTAT_QUEUE_FULL            0x28
 
-//
-// Enable Vital Product Data Flag (EVPD)
-// used with INQUIRY command.
-//
+/*
+ * Enable Vital Product Data Flag (EVPD)
+ * used with INQUIRY command.
+ */
 
 #define CDB_INQUIRY_EVPD           0x01
 
-//
-// Defines for format CDB
-//
+/*
+ * Defines for format CDB
+ */
 
 #define LUN0_FORMAT_SAVING_DEFECT_LIST 0
 #define USE_DEFAULTMSB  0
diff --git a/reactos/include/ddk/setypes.h b/reactos/include/ddk/setypes.h
index baf8fe0cbbf..5ef52e3e65f 100644
--- a/reactos/include/ddk/setypes.h
+++ b/reactos/include/ddk/setypes.h
@@ -1,4 +1,4 @@
-/* $Id: setypes.h,v 1.11 2003/02/15 18:43:20 ekohl Exp $
+/* $Id: setypes.h,v 1.12 2003/08/25 01:37:47 sedwards Exp $
  *
  * COPYRIGHT:         See COPYING in the top level directory for details
  * PROJECT:           ReactOS kernel
@@ -57,50 +57,50 @@
 
 typedef struct _ACCESS_TOKEN
 {
-  TOKEN_SOURCE			TokenSource;               // 0x00
-  LUID				TokenId;                   // 0x10
-  LUID				AuthenticationId;          // 0x18
-  LARGE_INTEGER			ExpirationTime;            // 0x20
-  LUID				ModifiedId;                // 0x28
-  ULONG				UserAndGroupCount;         // 0x30
-  ULONG				PrivilegeCount;            // 0x34
-  ULONG				VariableLength;            // 0x38
-  ULONG				DynamicCharged;            // 0x3C
-  ULONG				DynamicAvailable;          // 0x40
-  ULONG				DefaultOwnerIndex;         // 0x44
-  PSID_AND_ATTRIBUTES		UserAndGroups;             // 0x48
-  PSID				PrimaryGroup;              // 0x4C
-  PLUID_AND_ATTRIBUTES		Privileges;                // 0x50
-  ULONG				Unknown1;                  // 0x54
-  PACL				DefaultDacl;               // 0x58
-  TOKEN_TYPE			TokenType;                 // 0x5C
-  SECURITY_IMPERSONATION_LEVEL	ImpersonationLevel;        // 0x60
-  UCHAR				TokenFlags;                // 0x64
-  UCHAR				TokenInUse;                // 0x65
-  UCHAR				Unused[2];                 // 0x66
-  PVOID				ProxyData;                 // 0x68
-  PVOID				AuditData;                 // 0x6c
-  UCHAR				VariablePart[0];           // 0x70
+  TOKEN_SOURCE			TokenSource;               /* 0x00 */
+  LUID				TokenId;                   /* 0x10 */
+  LUID				AuthenticationId;          /* 0x18 */
+  LARGE_INTEGER			ExpirationTime;            /* 0x20 */
+  LUID				ModifiedId;                /* 0x28 */
+  ULONG				UserAndGroupCount;         /* 0x30 */
+  ULONG				PrivilegeCount;            /* 0x34 */
+  ULONG				VariableLength;            /* 0x38 */
+  ULONG				DynamicCharged;            /* 0x3C */
+  ULONG				DynamicAvailable;          /* 0x40 */
+  ULONG				DefaultOwnerIndex;         /* 0x44 */
+  PSID_AND_ATTRIBUTES		UserAndGroups;             /* 0x48 */
+  PSID				PrimaryGroup;              /* 0x4C */
+  PLUID_AND_ATTRIBUTES		Privileges;                /* 0x50 */
+  ULONG				Unknown1;                  /* 0x54 */
+  PACL				DefaultDacl;               /* 0x58 */
+  TOKEN_TYPE			TokenType;                 /* 0x5C */
+  SECURITY_IMPERSONATION_LEVEL	ImpersonationLevel;        /* 0x60 */
+  UCHAR				TokenFlags;                /* 0x64 */
+  UCHAR				TokenInUse;                /* 0x65 */
+  UCHAR				Unused[2];                 /* 0x66 */
+  PVOID				ProxyData;                 /* 0x68 */
+  PVOID				AuditData;                 /* 0x6c */
+  UCHAR				VariablePart[0];           /* 0x70 */
 } ACCESS_TOKEN, *PACCESS_TOKEN;
 
 
 typedef struct _SECURITY_SUBJECT_CONTEXT
 {
-  PACCESS_TOKEN ClientToken;                              // 0x0
-  SECURITY_IMPERSONATION_LEVEL ImpersonationLevel;        // 0x4
-  PACCESS_TOKEN PrimaryToken;                             // 0x8
-  PVOID ProcessAuditId;                                   // 0xC
+  PACCESS_TOKEN ClientToken;                              /* 0x0 */
+  SECURITY_IMPERSONATION_LEVEL ImpersonationLevel;        /* 0x4 */
+  PACCESS_TOKEN PrimaryToken;                             /* 0x8 */
+  PVOID ProcessAuditId;                                   /* 0xC */
 } SECURITY_SUBJECT_CONTEXT, *PSECURITY_SUBJECT_CONTEXT;
 
 
 typedef struct _SECURITY_CLIENT_CONTEXT
 {
-  SECURITY_QUALITY_OF_SERVICE SecurityQos;	// 0x00
-  PACCESS_TOKEN Token;				// 0x0C
-  BOOLEAN DirectlyAccessClientToken;		// 0x10
-  BOOLEAN DirectAccessEffectiveOnly;		// 0x11
-  BOOLEAN ServerIsRemote;			// 0x12
-  TOKEN_CONTROL ClientTokenControl;		// 0x14
+  SECURITY_QUALITY_OF_SERVICE SecurityQos;	/* 0x00 */
+  PACCESS_TOKEN Token;				/* 0x0C */
+  BOOLEAN DirectlyAccessClientToken;		/* 0x10 */
+  BOOLEAN DirectAccessEffectiveOnly;		/* 0x11 */
+  BOOLEAN ServerIsRemote;			/* 0x12 */
+  TOKEN_CONTROL ClientTokenControl;		/* 0x14 */
 } SECURITY_CLIENT_CONTEXT, *PSECURITY_CLIENT_CONTEXT;
 
 
diff --git a/reactos/include/ddk/srb.h b/reactos/include/ddk/srb.h
index 6a77bd752dc..6f14012daf9 100644
--- a/reactos/include/ddk/srb.h
+++ b/reactos/include/ddk/srb.h
@@ -1,4 +1,4 @@
-/* $Id: srb.h,v 1.2 2002/10/03 18:33:47 sedwards Exp $
+/* $Id: srb.h,v 1.3 2003/08/25 01:37:47 sedwards Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel
@@ -99,27 +99,27 @@ typedef struct _PORT_CONFIGURATION_INFORMATION
 
 typedef struct _SCSI_REQUEST_BLOCK
 {
-  USHORT Length;			// 0x00
-  UCHAR Function;			// 0x02
-  UCHAR SrbStatus;			// 0x03
-  UCHAR ScsiStatus;			// 0x04
-  UCHAR PathId;				// 0x05
-  UCHAR TargetId;			// 0x06
-  UCHAR Lun;				// 0x07
-  UCHAR QueueTag;			// 0x08
-  UCHAR QueueAction;			// 0x09
-  UCHAR CdbLength;			// 0x0A
-  UCHAR SenseInfoBufferLength;		// 0x0B
-  ULONG SrbFlags;			// 0x0C
-  ULONG DataTransferLength;		// 0x10
-  ULONG TimeOutValue;			// 0x14
-  PVOID DataBuffer;			// 0x18
-  PVOID SenseInfoBuffer;		// 0x1C
-  struct _SCSI_REQUEST_BLOCK *NextSrb;	// 0x20
-  PVOID OriginalRequest;		// 0x24
-  PVOID SrbExtension;			// 0x28
-  ULONG QueueSortKey;			// 0x2C
-  UCHAR Cdb[16];			// 0x30
+  USHORT Length;			/* 0x00 */
+  UCHAR Function;			/* 0x02 */
+  UCHAR SrbStatus;			/* 0x03 */
+  UCHAR ScsiStatus;			/* 0x04 */
+  UCHAR PathId;				/* 0x05 */
+  UCHAR TargetId;			/* 0x06 */
+  UCHAR Lun;				/* 0x07 */
+  UCHAR QueueTag;			/* 0x08 */
+  UCHAR QueueAction;			/* 0x09 */
+  UCHAR CdbLength;			/* 0x0A */
+  UCHAR SenseInfoBufferLength;		/* 0x0B */
+  ULONG SrbFlags;			/* 0x0C */
+  ULONG DataTransferLength;		/* 0x10 */
+  ULONG TimeOutValue;			/* 0x14 */
+  PVOID DataBuffer;			/* 0x18 */
+  PVOID SenseInfoBuffer;		/* 0x1C */
+  struct _SCSI_REQUEST_BLOCK *NextSrb;	/* 0x20 */
+  PVOID OriginalRequest;		/* 0x24 */
+  PVOID SrbExtension;			/* 0x28 */
+  ULONG QueueSortKey;			/* 0x2C */
+  UCHAR Cdb[16];			/* 0x30 */
 } SCSI_REQUEST_BLOCK, *PSCSI_REQUEST_BLOCK;
 
 #define SCSI_REQUEST_BLOCK_SIZE sizeof(SCSI_REQUEST_BLOCK)
diff --git a/reactos/include/ddk/types.h b/reactos/include/ddk/types.h
index 908a47764be..3d66bc2cdd9 100644
--- a/reactos/include/ddk/types.h
+++ b/reactos/include/ddk/types.h
@@ -1,16 +1,10 @@
 #ifndef __INCLUDE_DDK_TYPES_H
 #define __INCLUDE_DDK_TYPES_H
 
-// these should be moved to a file like ntdef.h
-
-
+/* these should be moved to a file like ntdef.h */
 
 typedef ULONG KAFFINITY, *PKAFFINITY;
 
-
-
-
-
 /*
  * Various other types (all quite pointless)
  */
@@ -26,7 +20,4 @@ typedef ULONG LOCK_OPERATION;
 typedef LARGE_INTEGER PHYSICAL_ADDRESS;
 typedef PHYSICAL_ADDRESS* PPHYSICAL_ADDRESS;
 
-
-
-
 #endif /* __INCLUDE_DDK_TYPES_H */
diff --git a/reactos/include/ddk/winddi.h b/reactos/include/ddk/winddi.h
index 405b144b792..9be3e0b2a7a 100644
--- a/reactos/include/ddk/winddi.h
+++ b/reactos/include/ddk/winddi.h
@@ -27,7 +27,7 @@
 typedef DWORD PTRDIFF;
 #endif
 
-#define GDI_DRIVER_VERSION 0x4000   // NT 4 compatibility
+#define GDI_DRIVER_VERSION 0x4000   /* NT 4 compatibility */
 
 /* FIXME: find definitions for these structs  */
 typedef PVOID  PCOLORADJUSTMENT;
@@ -195,7 +195,7 @@ enum _GLYPH_MODE
   FO_PATHOBJ
 };
 
-// Allowed values for GDIINFO.ulPrimaryOrder.
+/* Allowed values for GDIINFO.ulPrimaryOrder. */
 
 #define PRIMARY_ORDER_ABC       0
 #define PRIMARY_ORDER_ACB       1
@@ -204,7 +204,7 @@ enum _GLYPH_MODE
 #define PRIMARY_ORDER_CBA       4
 #define PRIMARY_ORDER_CAB       5
 
-// Allowed values for GDIINFO.ulHTPatternSize.
+/* Allowed values for GDIINFO.ulHTPatternSize. */
 
 #define HT_PATSIZE_2x2          0
 #define HT_PATSIZE_2x2_M        1
@@ -225,7 +225,7 @@ enum _GLYPH_MODE
 #define HT_PATSIZE_MAX_INDEX    HT_PATSIZE_16x16_M
 #define HT_PATSIZE_DEFAULT      HT_PATSIZE_4x4_M
 
-// Allowed values for GDIINFO.ulHTOutputFormat.
+/* Allowed values for GDIINFO.ulHTOutputFormat. */
 
 #define HT_FORMAT_1BPP          0
 #define HT_FORMAT_4BPP          2
@@ -235,7 +235,7 @@ enum _GLYPH_MODE
 #define HT_FORMAT_24BPP         6
 #define HT_FORMAT_32BPP         7
 
-// Allowed values for GDIINFO.flHTFlags.
+/* Allowed values for GDIINFO.flHTFlags. */
 
 #define HT_FLAG_SQUARE_DEVICE_PEL    0x00000001
 #define HT_FLAG_HAS_BLACK_DYE        0x00000002
@@ -614,7 +614,7 @@ typedef struct _IFIMETRICS
   PANOSE panose;
 } IFIMETRICS, *PIFIMETRICS;
 
-#define NB_RESERVED_COLORS              20 // number of fixed colors in system palette
+#define NB_RESERVED_COLORS              20 /* number of fixed colors in system palette */
 
 typedef struct _XLATEOBJ
 {
@@ -630,7 +630,7 @@ typedef struct _PALOBJ
 {
   PXLATEOBJ logicalToSystem;
   int *mapping;
-  PLOGPALETTE logpalette; // _MUST_ be the last field
+  PLOGPALETTE logpalette; /* _MUST_ be the last field */
 } PALOBJ, *PPALOBJ;
 
 typedef struct _PATHOBJ
diff --git a/reactos/include/defines.h b/reactos/include/defines.h
index 268de78306a..1011d297c22 100644
--- a/reactos/include/defines.h
+++ b/reactos/include/defines.h
@@ -42,11 +42,13 @@
 
 
 #ifndef WIN32_NO_STATUS
-//#define STATUS_WAIT_0     		(0x00000000L)
-//#define STATUS_ABANDONED_WAIT_0 	(0x00000080L)
-//#define STATUS_USER_APC    		(0x000000C0L)
-//#define STATUS_TIMEOUT     		(0x00000102L)
-//#define STATUS_PENDING     		(0x00000103L)
+/*
+#define STATUS_WAIT_0     		(0x00000000L)
+#define STATUS_ABANDONED_WAIT_0 	(0x00000080L)
+#define STATUS_USER_APC    		(0x000000C0L)
+#define STATUS_TIMEOUT     		(0x00000102L)
+#define STATUS_PENDING     		(0x00000103L)
+*/
 #endif /* WIN32_NO_STATUS */
 
 #define GA_PARENT               (1)
@@ -943,7 +945,7 @@ extern "C" {
 #define DSS_UNION	(16)
 #define DSS_DISABLED	(32)
 #define DSS_MONO	(128)
-#define DSS_RIGHT   (0x8000)    // Undocumented
+#define DSS_RIGHT   (0x8000)    /* Undocumented */
 
 /* DrawStatusText */
 #define SBT_NOBORDERS	(256)
@@ -1348,10 +1350,10 @@ extern "C" {
 #define CP_ACP	(0)
 #define CP_MACCP	(2)
 #define CP_OEMCP	(1)
-#define CP_THREAD_ACP			3			//ACP Current thread's ANSI code page 
-#define CP_SYMBOL				42			//Symbol code page (42) 
-#define CP_UTF7					65000		//Translate using UTF-7 
-#define CP_UTF8					65001		//Translate using UTF-8 
+#define CP_THREAD_ACP			3			/* ACP Current thread's ANSI code page */
+#define CP_SYMBOL				42			/* Symbol code page (42) */
+#define CP_UTF7					65000		/* Translate using UTF-7 */
+#define CP_UTF8					65001		/* Translate using UTF-8 */ 
 
 /* GetDateFormat */
 #define DATE_SHORTDATE	(1)
@@ -4843,19 +4845,19 @@ typedef enum _SC_ENUM_TYPE {
 #endif /* !__USE_W32API */
 
 typedef enum _SystemState {
-  STATE_SYSTEM_UNAVAILABLE        = 0x00000001, // Disabled
+  STATE_SYSTEM_UNAVAILABLE        = 0x00000001, /* Disabled */
   STATE_SYSTEM_SELECTED           = 0x00000002,
   STATE_SYSTEM_FOCUSED            = 0x00000004,
   STATE_SYSTEM_PRESSED            = 0x00000008,
   STATE_SYSTEM_CHECKED            = 0x00000010,
-  STATE_SYSTEM_MIXED              = 0x00000020, // 3-state checkbox or toolbar button
+  STATE_SYSTEM_MIXED              = 0x00000020, /* 3-state checkbox or toolbar button */
   STATE_SYSTEM_READONLY           = 0x00000040,
   STATE_SYSTEM_HOTTRACKED         = 0x00000080,
   STATE_SYSTEM_DEFAULT            = 0x00000100,
   STATE_SYSTEM_EXPANDED           = 0x00000200,
   STATE_SYSTEM_COLLAPSED          = 0x00000400,
   STATE_SYSTEM_BUSY               = 0x00000800,
-  STATE_SYSTEM_FLOATING           = 0x00001000, // Children "owned" not "contained" by parent
+  STATE_SYSTEM_FLOATING           = 0x00001000, /* Children "owned" not "contained" by parent */
   STATE_SYSTEM_MARQUEED           = 0x00002000,
   STATE_SYSTEM_ANIMATED           = 0x00004000,
   STATE_SYSTEM_INVISIBLE          = 0x00008000,
@@ -4867,11 +4869,11 @@ typedef enum _SystemState {
   STATE_SYSTEM_SELECTABLE         = 0x00200000,
   STATE_SYSTEM_LINKED             = 0x00400000,
   STATE_SYSTEM_TRAVERSED          = 0x00800000,
-  STATE_SYSTEM_MULTISELECTABLE    = 0x01000000,  // Supports multiple selection
-  STATE_SYSTEM_EXTSELECTABLE      = 0x02000000,  // Supports extended selection
-  STATE_SYSTEM_ALERT_LOW          = 0x04000000,  // This information is of low priority
-  STATE_SYSTEM_ALERT_MEDIUM       = 0x08000000,  // This information is of medium priority
-  STATE_SYSTEM_ALERT_HIGH         = 0x10000000,  // This information is of high priority
+  STATE_SYSTEM_MULTISELECTABLE    = 0x01000000,  /* Supports multiple selection */
+  STATE_SYSTEM_EXTSELECTABLE      = 0x02000000,  /* Supports extended selection */
+  STATE_SYSTEM_ALERT_LOW          = 0x04000000,  /* This information is of low priority */
+  STATE_SYSTEM_ALERT_MEDIUM       = 0x08000000,  /* This information is of medium priority */
+  STATE_SYSTEM_ALERT_HIGH         = 0x10000000,  /* This information is of high priority */
   STATE_SYSTEM_VALID              = 0x1FFFFFFF
 } SystemState;
 
diff --git a/reactos/include/dflat32/classes.h b/reactos/include/dflat32/classes.h
index 74fceb9bfb9..653013b4353 100644
--- a/reactos/include/dflat32/classes.h
+++ b/reactos/include/dflat32/classes.h
@@ -15,7 +15,7 @@ ClassDef(  APPLICATION, NORMAL,  ApplicationProc, VISIBLE   |
                                                   SAVESELF  |
                                                   CONTROLBOX )
 ClassDef(  TEXTBOX,     NORMAL,  TextBoxProc,     0          )
-//ClassDef(  LISTBOX,     TEXTBOX, ListBoxProc,     0          )
+/* ClassDef(  LISTBOX,     TEXTBOX, ListBoxProc,     0          ) */
 ClassDef(  EDITBOX,     TEXTBOX, EditBoxProc,     0          )
 ClassDef(  MENUBAR,     NORMAL,  MenuBarProc,     NOCLIP     )
 ClassDef(  POPDOWNMENU, LISTBOX, PopDownProc,     SAVESELF  |
@@ -30,8 +30,8 @@ ClassDef(  DIALOG,      NORMAL,  DialogProc,      SHADOW    |
                                                   HASBORDER |
                                                   NOCLIP     )
 ClassDef(  BOX,         NORMAL,  BoxProc,         HASBORDER  )
-//ClassDef(  BUTTON,      TEXTBOX, ButtonProc,      SHADOW     )
-//ClassDef(  COMBOBOX,    EDITBOX, ComboProc,       0          )
+/* ClassDef(  BUTTON,      TEXTBOX, ButtonProc,      SHADOW     ) */
+/* ClassDef(  COMBOBOX,    EDITBOX, ComboProc,       0          ) */
 ClassDef(  TEXT,        TEXTBOX, TextProc,        0          )
 ClassDef(  RADIOBUTTON, TEXTBOX, RadioButtonProc, 0          )
 ClassDef(  CHECKBOX,    TEXTBOX, CheckBoxProc,    0          )
diff --git a/reactos/include/dflat32/config.h b/reactos/include/dflat32/config.h
index 065e197e598..7b70cf4f451 100644
--- a/reactos/include/dflat32/config.h
+++ b/reactos/include/dflat32/config.h
@@ -24,7 +24,7 @@ typedef struct config {
 	BOOL StatusBar;    /* True for appl'n window status bar  */
     BOOL Texture;      /* True for textured appl window      */
 #endif
-//    int ScreenLines;   /* Number of screen lines (25/43/50)  */
+/*    int ScreenLines;  */ /* Number of screen lines (25/43/50)  */
 	char PrinterPort[5];
 	int LinesPage;     /* Lines per printer page             */
 	int CharsLine;	   /* Characters per printer line        */
diff --git a/reactos/include/dflat32/dflat.h b/reactos/include/dflat32/dflat.h
index 0d3ec41a9f6..eb402cda7e1 100644
--- a/reactos/include/dflat32/dflat.h
+++ b/reactos/include/dflat32/dflat.h
@@ -2,7 +2,7 @@
 #ifndef DFLAT_H
 #define DFLAT_H
 
-//#ifdef BUILD_FULL_DFLAT
+/* #ifdef BUILD_FULL_DFLAT */
 #define INCLUDE_MULTI_WINDOWS
 #define INCLUDE_LOGGING
 #define INCLUDE_SHELLDOS
@@ -12,7 +12,7 @@
 #define INCLUDE_MAXIMIZE
 #define INCLUDE_RESTORE
 #define INCLUDE_EXTENDEDSELECTIONS
-//#endif
+/* #endif */
 
 #include <windows.h>
 #include <stdio.h>
@@ -272,7 +272,7 @@ extern BOOL ClipString;
 #define SCROLLBARCHAR  (unsigned char) 176
 #define SCROLLBOXCHAR  (unsigned char) 178
 /* ------------------ menu characters --------------------- */
-#define CHECKMARK      (unsigned char) '\x04' //(SCREENHEIGHT==25?251:4)
+#define CHECKMARK      (unsigned char) '\x04' /* (SCREENHEIGHT==25?251:4) */
 #define CASCADEPOINTER (unsigned char) '\x10'
 /* ----------------- title bar characters ----------------- */
 #define CONTROLBOXCHAR (unsigned char) '\xf0'
diff --git a/reactos/include/dflat32/system.h b/reactos/include/dflat32/system.h
index 42136c1b242..5244db73b5b 100644
--- a/reactos/include/dflat32/system.h
+++ b/reactos/include/dflat32/system.h
@@ -2,11 +2,11 @@
 #ifndef SYSTEM_H
 #define SYSTEM_H
 
-//#if MSC | WATCOM
+/* #if MSC | WATCOM */
 #include <direct.h>
-//#else
-//#include <dir.h>
-//#endif
+/* #else */
+/* #include <dir.h> */
+/* #endif */
 
 #define swap(a,b){int x=a;a=b;b=x;}
 /* ------- platform-dependent values ------ */
@@ -16,8 +16,8 @@
 #define ZEROFLAG 0x40
 #define MAXSAVES 50
 
-//#define SCREENWIDTH  (80)
-//#define SCREENHEIGHT (25)
+/* #define SCREENWIDTH  (80) */
+/* #define SCREENHEIGHT (25) */
 
 HANDLE hInput;
 HANDLE hOutput;
diff --git a/reactos/include/errors.h b/reactos/include/errors.h
index acfa70db1eb..914746bbe43 100644
--- a/reactos/include/errors.h
+++ b/reactos/include/errors.h
@@ -41,15 +41,15 @@
 extern "C" {
 #endif /* __cplusplus */
 
-//
-//	Return Code macros
-//
+/*
+ *	Return Code macros
+ */
 #define	SUCCEEDED(Status)	((HRESULT)(Status) >= 0)
 #define	FAILED(Status)		((HRESULT)(Status)<0)
 
-//
-//	Success Codes
-//
+/*
+ *	Success Codes
+ */
 #define S_OK						0x00000000L
 #define S_FALSE						0x00000001L
 
diff --git a/reactos/include/kernel32/process.h b/reactos/include/kernel32/process.h
index 2ffe32c08ad..0d5d83834a5 100644
--- a/reactos/include/kernel32/process.h
+++ b/reactos/include/kernel32/process.h
@@ -9,7 +9,7 @@ typedef void* HANDLE_TABLE;
 typedef struct _pPebInfo {
 	LPWSTR		lpCommandLine;
 	DWORD		cb;
-	HANDLE		hStdInput; //18
+	HANDLE		hStdInput; /* 18 */
     	HANDLE		hStdOutput;  
     	HANDLE 		hStdError; 
 	LPWSTR		lpEnvironment;
@@ -34,7 +34,7 @@ typedef struct _NT_PEB
 	
 	LONG			ImageBaseAddress; 
 	void			*HeapIndex;
-	DWORD			dwTlsBits[2]; // tls in use bits 
+	DWORD			dwTlsBits[2]; /* tls in use bits */
 	WORD			NumberOfProcessors;
 	WORD			NtGlobalFlag;
 	DWORD			dwCriticalSectionTimeout;
diff --git a/reactos/include/kernel32/winnls.h b/reactos/include/kernel32/winnls.h
index d07a3ba7711..8e913438285 100644
--- a/reactos/include/kernel32/winnls.h
+++ b/reactos/include/kernel32/winnls.h
@@ -2,7 +2,7 @@
 #define __WINE_WINNLS_H
 
 /* flags to GetLocaleInfo */
-//#define	LOCALE_NOUSEROVERRIDE	    0x80000000
+/* #define	LOCALE_NOUSEROVERRIDE	    0x80000000 */
 #define	LOCALE_USE_CP_ACP	    0x40000000
 
 #define LOCALE_LOCALEINFOFLAGSMASK  0xC0000000
@@ -126,13 +126,13 @@
 #endif
 
 #if 0
-#define CP_ACP					0			//ANSI code page 
-#define CP_OEMCP				1			//OEM code page 
-#define CP_MACCP				2			//Macintosh code page 
-#define CP_THREAD_ACP			3			//ACP Current thread's ANSI code page 
-#define CP_SYMBOL				42			//Symbol code page (42) 
-#define CP_UTF7					65000		//Translate using UTF-7 
-#define CP_UTF8					65001		//Translate using UTF-8 
+#define CP_ACP					0		/* ANSI code page */
+#define CP_OEMCP				1		/* OEM code page */
+#define CP_MACCP				2		/* Macintosh code page */
+#define CP_THREAD_ACP				3		/* ACP Current thread's ANSI code page */
+#define CP_SYMBOL				42		/* Symbol code page (42) */
+#define CP_UTF7					65000		/* Translate using UTF-7 */
+#define CP_UTF8					65001		/* Translate using UTF-8 */
 #endif
 
 #if 0
@@ -154,9 +154,11 @@
 #ifdef _KERNEL32_INCLUDE_LANG_
 #define LANG_SYSTEM_DEFAULT	(MAKELANGID(LANG_NEUTRAL, SUBLANG_SYS_DEFAULT))
 #define LANG_USER_DEFAULT	(MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT))
-//#define LOCALE_SYSTEM_DEFAULT	(MAKELCID(LANG_SYSTEM_DEFAULT, SORT_DEFAULT))
-//#define LOCALE_USER_DEFAULT	(MAKELCID(LANG_USER_DEFAULT, SORT_DEFAULT)) 
-//#define LOCALE_NEUTRAL		(MAKELCID(MAKELANGID(LANG_NEUTRAL,SUBLANG_NEUTRAL),SORT_DEFAULT))
+/*
+ *#define LOCALE_SYSTEM_DEFAULT	(MAKELCID(LANG_SYSTEM_DEFAULT, SORT_DEFAULT))
+ *#define LOCALE_USER_DEFAULT	(MAKELCID(LANG_USER_DEFAULT, SORT_DEFAULT)) 
+ *#define LOCALE_NEUTRAL	(MAKELCID(MAKELANGID(LANG_NEUTRAL,SUBLANG_NEUTRAL),SORT_DEFAULT))
+ */
 #endif
 
 /* Language IDs (were in winnt.h,  for some reason) */
diff --git a/reactos/include/mmddk.h b/reactos/include/mmddk.h
index 46912451524..9e335c08ab2 100644
--- a/reactos/include/mmddk.h
+++ b/reactos/include/mmddk.h
@@ -27,7 +27,7 @@
 #define __MMDDK_H
 
 #include "mmsystem.h"
-//#include "winbase.h"
+/* #include "winbase.h" */
 
 #define MAX_MIDIINDRV 	(16)
 /* For now I'm making 16 the maximum number of midi devices one can
@@ -417,9 +417,6 @@ typedef struct {
 	UINT			wType;			/* driver type (filled in by the driver) */
 } MCI_OPEN_DRIVER_PARMSW, *LPMCI_OPEN_DRIVER_PARMSW;
 
-//DECL_WINELIB_TYPE_AW(MCI_OPEN_DRIVER_PARMS)
-//DECL_WINELIB_TYPE_AW(LPMCI_OPEN_DRIVER_PARMS)
-
 DWORD 			WINAPI	mciGetDriverData(UINT uDeviceID);
 BOOL			WINAPI	mciSetDriverData(UINT uDeviceID, DWORD dwData);
 UINT			WINAPI	mciDriverYield(UINT uDeviceID);
diff --git a/reactos/include/msvcrt/crttypes.h b/reactos/include/msvcrt/crttypes.h
index fe152093032..0994ddb6e66 100644
--- a/reactos/include/msvcrt/crttypes.h
+++ b/reactos/include/msvcrt/crttypes.h
@@ -14,10 +14,12 @@
 
 #ifdef  __GNUC__
 
-//typedef long long LONGLONG;
-//typedef unsigned long long ULONGLONG;
-//typedef long long *PLONGLONG;
-//typedef unsigned long long *PULONGLONG;
+/*
+typedef long long LONGLONG;
+typedef unsigned long long ULONGLONG;
+typedef long long *PLONGLONG;
+typedef unsigned long long *PULONGLONG;
+*/
 #define HAVE_LONGLONG
 #define LONGLONG_DEFINED
 #define LONGLONG    long long
diff --git a/reactos/include/msvcrt/ctype.h b/reactos/include/msvcrt/ctype.h
index f0681a6bd11..96e0b214fe4 100644
--- a/reactos/include/msvcrt/ctype.h
+++ b/reactos/include/msvcrt/ctype.h
@@ -18,9 +18,9 @@
  *  DISCLAIMED. This includes but is not limited to warranties of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $Revision: 1.8 $
- * $Author: robd $
- * $Date: 2003/02/21 16:32:57 $
+ * $Revision: 1.9 $
+ * $Author: sedwards $
+ * $Date: 2003/08/25 01:37:47 $
  *
  */
 
@@ -119,8 +119,8 @@ int iswspace(wint_t);
 int iswupper(wint_t);
 int iswxdigit(wint_t);
 
-//wchar_t towlower(wchar_t);
-//wchar_t towupper(wchar_t);
+/* wchar_t towlower(wchar_t); */
+/* wchar_t towupper(wchar_t); */
 int towlower(wint_t);
 int towupper(wint_t);
 
diff --git a/reactos/include/msvcrt/float.h b/reactos/include/msvcrt/float.h
index 39b0edb5784..a55e6dcfb0f 100644
--- a/reactos/include/msvcrt/float.h
+++ b/reactos/include/msvcrt/float.h
@@ -27,9 +27,9 @@
  *  DISCLAIMED. This includes but is not limited to warranties of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $Revision: 1.4 $
- * $Author: robd $
- * $Date: 2002/11/24 18:06:00 $
+ * $Revision: 1.5 $
+ * $Author: sedwards $
+ * $Date: 2003/08/25 01:37:47 $
  *
  */
 
@@ -196,9 +196,9 @@ int     _finite         (double);
 int     _fpclass        (double);
 int     _isnan          (double);
 
-int     _isinf          (double); // not exported
-int     _isnanl         (long double); // not exported
-int     _isinfl         (long double); // not exported
+int     _isinf          (double); /* not exported */
+int     _isnanl         (long double); /* not exported */
+int     _isinfl         (long double); /* not exported */
 
 #define isnan(x)        _isnan(x)
 #define isinf(x)        _isinf(x)
diff --git a/reactos/include/msvcrt/internal/file.h b/reactos/include/msvcrt/internal/file.h
index 4507cf1cd0f..241b18ac42f 100644
--- a/reactos/include/msvcrt/internal/file.h
+++ b/reactos/include/msvcrt/internal/file.h
@@ -24,11 +24,11 @@ extern "C" {
 #define _IOUNGETC 010000  /* there is an ungetc'ed character in the buffer */
 #endif
 
-// might need check for IO_APPEND aswell
+/* might need check for IO_APPEND aswell */
 #define OPEN4WRITING(f) ((((f)->_flag & _IOWRT)  == _IOWRT))
 #define OPEN4READING(f) ((((f)->_flag & _IOREAD) == _IOREAD))
 
-// might need check for IO_APPEND aswell
+/* might need check for IO_APPEND aswell */
 #define WRITE_STREAM(f) ((((f)->_flag & _IOWRT) == _IOWRT))
 #define READ_STREAM(f) ((((f)->_flag & _IOREAD) == _IOREAD))
 
diff --git a/reactos/include/msvcrt/math.h b/reactos/include/msvcrt/math.h
index 0f56a8c3d90..91bfd2299c7 100644
--- a/reactos/include/msvcrt/math.h
+++ b/reactos/include/msvcrt/math.h
@@ -18,12 +18,12 @@
  *  DISCLAIMED. This includes but is not limited to warranties of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $Revision: 1.4 $
- * $Author: robd $
- * $Date: 2002/11/24 18:06:00 $
+ * $Revision: 1.5 $
+ * $Author: sedwards $
+ * $Date: 2003/08/25 01:37:47 $
  *
  */
-// added modfl 
+/* added modfl */
 
 #ifndef _MATH_H_
 #define _MATH_H_
@@ -186,10 +186,12 @@ double  linkme_modf(double x, double* ip);
 long double linkme_modfl(long double x,long double* ip);
 double  linkme_fmod(double x, double y);
 
-//linkme_log2
-//linkme_floor
-//linkme_ldexp
-//linkme_pow
+/*
+ * linkme_log2
+ * linkme_floor
+ * linkme_ldexp
+ * linkme_pow
+ */
 
 #endif
 
diff --git a/reactos/include/msvcrt/mbctype.h b/reactos/include/msvcrt/mbctype.h
index dc672d85fbc..dd3f68c1421 100644
--- a/reactos/include/msvcrt/mbctype.h
+++ b/reactos/include/msvcrt/mbctype.h
@@ -36,10 +36,10 @@
 
 /* TODO: bit masks */
 /*
-//#define _MS   0x01
-//#define _MP   0x02
-//#define _M1   0x04
-//#define _M2   0x08
+ *#define _MS   0x01
+ *#define _MP   0x02
+ *#define _M1   0x04
+ *#define _M2   0x08
 #define _SBUP
 #define _SBLOW
 */
diff --git a/reactos/include/msvcrt/msvcrtdbg.h b/reactos/include/msvcrt/msvcrtdbg.h
index bbc042e0628..8a07d19b8b4 100644
--- a/reactos/include/msvcrt/msvcrtdbg.h
+++ b/reactos/include/msvcrt/msvcrtdbg.h
@@ -49,15 +49,15 @@
 #define CHECKPOINT
 #endif /* NDEBUG */
 
-//ULONG CDECL DbgPrint(PCH Format, ...);
-//ULONG DbgPrint(PCH Format,...);
-//unsigned long DbgPrint(const char* Format, ...);
+/* ULONG CDECL DbgPrint(PCH Format, ...); */
+/* ULONG DbgPrint(PCH Format,...); */
+/* unsigned long DbgPrint(const char* Format, ...); */
 
 
 
-//#define TRACE 0 ? (void)0 : Trace
+/* #define TRACE 0 ? (void)0 : Trace */
 
-//void Trace(TCHAR* lpszFormat, ...);
+/* void Trace(TCHAR* lpszFormat, ...); */
 
 
 
diff --git a/reactos/include/msvcrt/search.h b/reactos/include/msvcrt/search.h
index b42c4d006cc..054f8648a32 100644
--- a/reactos/include/msvcrt/search.h
+++ b/reactos/include/msvcrt/search.h
@@ -2,34 +2,38 @@
 #ifndef _SEARCH_H_
 #define _SEARCH_H_
 
-//char    *key
-//void    *data
-
-//enum { FIND, ENTER } ACTION;
-//enum { preorder, postorder, endorder, leaf } VISIT;
+/*
+ *char    *key
+ *void    *data
+ *enum { FIND, ENTER } ACTION;
+ *enum { preorder, postorder, endorder, leaf } VISIT;
+ */
 
 #include <msvcrt/stddef.h>
 #include <msvcrt/sys/types.h>
 
 
-//The Single UNIX ® Specification, Version 2 Copyright © 1997 The Open Group 
+/* The Single UNIX ® Specification, Version 2 Copyright © 1997 The Open Group */
 
-//int    hcreate(size_t);
-//void   hdestroy(void);
-//ENTRY *hsearch(ENTRY, ACTION);
-//void   insque(void *, void *);
+/*
+ *int    hcreate(size_t);
+ *void   hdestroy(void);
+ *ENTRY *hsearch(ENTRY, ACTION);
+ *void   insque(void *, void *);
+ */
 void  *_lfind(const void *, const void *, size_t *,
                size_t, int (*)(const void *, const void *));
 void  *_lsearch(const void *, void *, size_t *,
                size_t, int (*)(const void *, const void *));
-//void   remque(void *);
-//void  *tdelete(const void *, void **,
-//               int(*)(const void *, const void *));
-//void  *tfind(const void *, void *const *,
-//               int(*)(const void *, const void *));
-//void  *tsearch(const void *, void **,
-//               int(*)(const void *, const void *));
-//void   twalk(const void *,
-//             void (*)(const void *, VISIT, int ));
-
+/*
+ *void   remque(void *);
+ *void  *tdelete(const void *, void **,
+ *               int(*)(const void *, const void *));
+ *void  *tfind(const void *, void *const *,
+ *               int(*)(const void *, const void *));
+ *void  *tsearch(const void *, void **,
+ *               int(*)(const void *, const void *));
+ *void   twalk(const void *,
+ *             void (*)(const void *, VISIT, int ));
+*/
 #endif
diff --git a/reactos/include/msvcrt/stdio.h b/reactos/include/msvcrt/stdio.h
index 076b7a6c535..8ddce7d8c82 100644
--- a/reactos/include/msvcrt/stdio.h
+++ b/reactos/include/msvcrt/stdio.h
@@ -22,9 +22,9 @@
  *  DISCLAIMED. This includes but is not limited to warranties of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $Revision: 1.6 $
- * $Author: robd $
- * $Date: 2002/11/25 15:47:52 $
+ * $Revision: 1.7 $
+ * $Author: sedwards $
+ * $Date: 2003/08/25 01:37:47 $
  *
  */
 /* Appropriated for Reactos Crtdll by Ariadne */
@@ -73,10 +73,12 @@ extern "C" {
  * functions later on in the file which use va_list. That conflicts with
  * using stdio.h and varargs.h in the same file, so I do the typedef myself.
  */
-//#ifndef _VA_LIST
-//#define _VA_LIST
-//typedef   char* va_list;
-//#endif
+/*
+ *#ifndef _VA_LIST
+ *#define _VA_LIST
+ *typedef   char* va_list;
+ *#endif
+ */
 #include <msvcrt/stdarg.h>
 
 /*
@@ -262,8 +264,8 @@ wint_t fgetwc(FILE* fileRead);
 wint_t fputwc(wchar_t wc, FILE* fileWrite);
 wint_t getwc(FILE *fileRead); // not exported from crtdll
 
-// TODO: check type wint_t, why doesn't compare to WEOF correctly ???
-//wint_t putwc(wint_t wc, FILE* fileWrite);
+/* TODO: check type wint_t, why doesn't compare to WEOF correctly ??? */
+/* wint_t putwc(wint_t wc, FILE* fileWrite); */
 int putwc(wint_t wc, FILE* fileWrite);
 
 wint_t putwchar(wint_t c);
@@ -344,7 +346,7 @@ void _wperror(const wchar_t *s);
 
 #define clearerr(f)  (((f)->_flag) &= ~(_IOERR|_IOEOF))
 #define feof(f)      (((f)->_flag&_IOEOF)!=0)
-//#define ferror(f)    (((f)->_flag&_IOERR)!=0)
+/* #define ferror(f)    (((f)->_flag&_IOERR)!=0) */
 int ferror(FILE* fileIsError);
 #define perror(s)    (fprintf(stderr, "%s: %s\n", (s), _strerror(NULL)))
 
diff --git a/reactos/include/msvcrt/string.h b/reactos/include/msvcrt/string.h
index ac866dc88fd..b5de7b7d406 100644
--- a/reactos/include/msvcrt/string.h
+++ b/reactos/include/msvcrt/string.h
@@ -18,9 +18,9 @@
  *  DISCLAIMED. This includes but is not limited to warranties of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $Revision: 1.5 $
- * $Author: robd $
- * $Date: 2002/11/24 18:06:00 $
+ * $Revision: 1.6 $
+ * $Author: sedwards $
+ * $Date: 2003/08/25 01:37:47 $
  *
  */
 /* Appropriated for Reactos Crtdll by Ariadne */
@@ -44,7 +44,7 @@
 extern "C" {
 #endif
 
-char * ___strtok; // removed extern specifier 02-06-98, BD
+char * ___strtok; /* removed extern specifier 02-06-98, BD */
 
 /*
  * Prototypes of the ANSI Standard C library string functions.
@@ -63,7 +63,7 @@ size_t  strcspn(const char* szGetPrefix, const char* szNotIncluding);
 char*   strerror(int nError); /* NOTE: NOT an old name wrapper. */
 char *  _strerror(const char *s);
 size_t  strlen(const char* sz);
-size_t  strnlen(const char* sz, size_t count); // not exported
+size_t  strnlen(const char* sz, size_t count); /* not exported */
 char*   strncat(char* szAddTo, const char* szAdd, size_t sizeMaxAdd);
 int     strncmp(const char* sz1, const char* sz2, size_t sizeMaxCompare);
 char*   strncpy(char* szCopyTo, const char* szSource, size_t sizeMaxCopy);
diff --git a/reactos/include/napi/lpc.h b/reactos/include/napi/lpc.h
index 14127ff631c..3c713d6968e 100644
--- a/reactos/include/napi/lpc.h
+++ b/reactos/include/napi/lpc.h
@@ -55,7 +55,7 @@ typedef struct _LPC_MESSAGE
    USHORT VirtualRangesOffset;
    CLIENT_ID ClientId;
    ULONG MessageId;
-   ULONG SectionSize; // CallbackID
+   ULONG SectionSize; /* CallbackID */
 } LPC_MESSAGE, *PLPC_MESSAGE;
 
 #endif /* !__USE_W32API */
diff --git a/reactos/include/napi/npipe.h b/reactos/include/napi/npipe.h
index 58c1b1acecf..758a7d7120d 100644
--- a/reactos/include/napi/npipe.h
+++ b/reactos/include/napi/npipe.h
@@ -135,7 +135,7 @@ typedef struct _NPFS_WAIT_PIPE
    LARGE_INTEGER Timeout;
 } NPFS_WAIT_PIPE, *PNPFS_WAIT_PIPE;
 
-#ifdef __GNUC__ // robd
+#ifdef __GNUC__ /* robd */
 typedef struct _NPFS_LISTEN
 {
 } NPFS_LISTEN, *PNPFS_LISTEN;
diff --git a/reactos/include/napi/shared_data.h b/reactos/include/napi/shared_data.h
index 8bf83f8a9ea..2893d152fc4 100644
--- a/reactos/include/napi/shared_data.h
+++ b/reactos/include/napi/shared_data.h
@@ -31,7 +31,7 @@ typedef struct _KUSER_SHARED_DATA
    ULONG NtMinorVersion;
    BOOLEAN ProcessorFeatures[PROCESSOR_FEATURES_MAX];
 
-   // NT5 / Win2k specific ??
+   /* NT5 / Win2k specific ?? */
    ULONG Reserved1;
    ULONG Reserved3;
    volatile ULONG TimeSlip;
diff --git a/reactos/include/napi/teb.h b/reactos/include/napi/teb.h
index 71bffb3cc3f..701de835972 100644
--- a/reactos/include/napi/teb.h
+++ b/reactos/include/napi/teb.h
@@ -48,16 +48,16 @@ typedef struct _RTL_USER_PROCESS_PARAMETERS {
 } RTL_USER_PROCESS_PARAMETERS, *PRTL_USER_PROCESS_PARAMETERS;
 
 typedef struct _NT_TIB {
-    struct _EXCEPTION_REGISTRATION_RECORD* ExceptionList;  // 00h
-    PVOID StackBase;                                       // 04h
-    PVOID StackLimit;                                      // 08h
-    PVOID SubSystemTib;                                    // 0Ch
+    struct _EXCEPTION_REGISTRATION_RECORD* ExceptionList;  /* 00h */
+    PVOID StackBase;                                       /* 04h */
+    PVOID StackLimit;                                      /* 08h */
+    PVOID SubSystemTib;                                    /* 0Ch */
     union {
-        PVOID FiberData;                                   // 10h
-        ULONG Version;                                     // 10h
+        PVOID FiberData;                                   /* 10h */
+        ULONG Version;                                     /* 10h */
     } Fib;
-    PVOID ArbitraryUserPointer;                            // 14h
-    struct _NT_TIB *Self;                                  // 18h
+    PVOID ArbitraryUserPointer;                            /* 14h */
+    struct _NT_TIB *Self;                                  /* 18h */
 } NT_TIB, *PNT_TIB;
 
 #endif /* !__USE_W32API */
@@ -101,58 +101,58 @@ typedef VOID STDCALL_FUNC (*PPEBLOCKROUTINE)(PVOID);
 
 typedef struct _PEB
 {
-   UCHAR InheritedAddressSpace;                     // 00h
-   UCHAR ReadImageFileExecOptions;                  // 01h
-   UCHAR BeingDebugged;                             // 02h
-   UCHAR Spare;                                     // 03h
-   PVOID Mutant;                                    // 04h
-   PVOID ImageBaseAddress;                          // 08h
-   PPEB_LDR_DATA Ldr;                               // 0Ch
-   PRTL_USER_PROCESS_PARAMETERS ProcessParameters;  // 10h
-   PVOID SubSystemData;                             // 14h
-   PVOID ProcessHeap;                               // 18h
-   PVOID FastPebLock;                               // 1Ch
-   PPEBLOCKROUTINE FastPebLockRoutine;              // 20h
-   PPEBLOCKROUTINE FastPebUnlockRoutine;            // 24h
-   ULONG EnvironmentUpdateCount;                    // 28h
-   PVOID* KernelCallbackTable;                      // 2Ch
-   PVOID EventLogSection;                           // 30h
-   PVOID EventLog;                                  // 34h
-   PPEB_FREE_BLOCK FreeList;                        // 38h
-   ULONG TlsExpansionCounter;                       // 3Ch
-   PVOID TlsBitmap;                                 // 40h
-   ULONG TlsBitmapBits[0x2];                        // 44h
-   PVOID ReadOnlySharedMemoryBase;                  // 4Ch
-   PVOID ReadOnlySharedMemoryHeap;                  // 50h
-   PVOID* ReadOnlyStaticServerData;                 // 54h
-   PVOID AnsiCodePageData;                          // 58h
-   PVOID OemCodePageData;                           // 5Ch
-   PVOID UnicodeCaseTableData;                      // 60h
-   ULONG NumberOfProcessors;                        // 64h
-   ULONG NtGlobalFlag;                              // 68h
-   UCHAR Spare2[0x4];                               // 6Ch
-   LARGE_INTEGER CriticalSectionTimeout;            // 70h
-   ULONG HeapSegmentReserve;                        // 78h
-   ULONG HeapSegmentCommit;                         // 7Ch
-   ULONG HeapDeCommitTotalFreeThreshold;            // 80h
-   ULONG HeapDeCommitFreeBlockThreshold;            // 84h
-   ULONG NumberOfHeaps;                             // 88h
-   ULONG MaximumNumberOfHeaps;                      // 8Ch
-   PVOID** ProcessHeaps;                            // 90h
-   PVOID GdiSharedHandleTable;                      // 94h
-   PVOID ProcessStarterHelper;                      // 98h
-   PVOID GdiDCAttributeList;                        // 9Ch
-   PVOID LoaderLock;                                // A0h
-   ULONG OSMajorVersion;                            // A4h
-   ULONG OSMinorVersion;                            // A8h
-   USHORT OSBuildNumber;                            // ACh
-   UCHAR SPMajorVersion;                            // AEh
-   UCHAR SPMinorVersion;                            // AFh
-   ULONG OSPlatformId;                              // B0h
-   ULONG ImageSubSystem;                            // B4h
-   ULONG ImageSubSystemMajorVersion;                // B8h
-   ULONG ImageSubSystemMinorVersion;                // C0h
-   ULONG GdiHandleBuffer[0x22];                     // C4h
+   UCHAR InheritedAddressSpace;                     /* 00h */
+   UCHAR ReadImageFileExecOptions;                  /* 01h */
+   UCHAR BeingDebugged;                             /* 02h */
+   UCHAR Spare;                                     /* 03h */
+   PVOID Mutant;                                    /* 04h */
+   PVOID ImageBaseAddress;                          /* 08h */
+   PPEB_LDR_DATA Ldr;                               /* 0Ch */
+   PRTL_USER_PROCESS_PARAMETERS ProcessParameters;  /* 10h */
+   PVOID SubSystemData;                             /* 14h */
+   PVOID ProcessHeap;                               /* 18h */
+   PVOID FastPebLock;                               /* 1Ch */
+   PPEBLOCKROUTINE FastPebLockRoutine;              /* 20h */
+   PPEBLOCKROUTINE FastPebUnlockRoutine;            /* 24h */
+   ULONG EnvironmentUpdateCount;                    /* 28h */
+   PVOID* KernelCallbackTable;                      /* 2Ch */
+   PVOID EventLogSection;                           /* 30h */
+   PVOID EventLog;                                  /* 34h */
+   PPEB_FREE_BLOCK FreeList;                        /* 38h */
+   ULONG TlsExpansionCounter;                       /* 3Ch */
+   PVOID TlsBitmap;                                 /* 40h */
+   ULONG TlsBitmapBits[0x2];                        /* 44h */
+   PVOID ReadOnlySharedMemoryBase;                  /* 4Ch */
+   PVOID ReadOnlySharedMemoryHeap;                  /* 50h */
+   PVOID* ReadOnlyStaticServerData;                 /* 54h */
+   PVOID AnsiCodePageData;                          /* 58h */
+   PVOID OemCodePageData;                           /* 5Ch */
+   PVOID UnicodeCaseTableData;                      /* 60h */
+   ULONG NumberOfProcessors;                        /* 64h */
+   ULONG NtGlobalFlag;                              /* 68h */
+   UCHAR Spare2[0x4];                               /* 6Ch */
+   LARGE_INTEGER CriticalSectionTimeout;            /* 70h */
+   ULONG HeapSegmentReserve;                        /* 78h */
+   ULONG HeapSegmentCommit;                         /* 7Ch */
+   ULONG HeapDeCommitTotalFreeThreshold;            /* 80h */
+   ULONG HeapDeCommitFreeBlockThreshold;            /* 84h */
+   ULONG NumberOfHeaps;                             /* 88h */
+   ULONG MaximumNumberOfHeaps;                      /* 8Ch */
+   PVOID** ProcessHeaps;                            /* 90h */
+   PVOID GdiSharedHandleTable;                      /* 94h */
+   PVOID ProcessStarterHelper;                      /* 98h */
+   PVOID GdiDCAttributeList;                        /* 9Ch */
+   PVOID LoaderLock;                                /* A0h */
+   ULONG OSMajorVersion;                            /* A4h */
+   ULONG OSMinorVersion;                            /* A8h */
+   USHORT OSBuildNumber;                            /* ACh */
+   UCHAR SPMajorVersion;                            /* AEh */
+   UCHAR SPMinorVersion;                            /* AFh */
+   ULONG OSPlatformId;                              /* B0h */
+   ULONG ImageSubSystem;                            /* B4h */
+   ULONG ImageSubSystemMajorVersion;                /* B8h */
+   ULONG ImageSubSystemMinorVersion;                /* C0h */
+   ULONG GdiHandleBuffer[0x22];                     /* C4h */
 } PEB;
 
 #ifndef __USE_W32API
@@ -170,66 +170,66 @@ typedef struct _GDI_TEB_BATCH
 
 typedef struct _TEB
 {
-   NT_TIB Tib;                         // 00h
-   PVOID EnvironmentPointer;           // 1Ch
-   CLIENT_ID Cid;                      // 20h
-   PVOID ActiveRpcInfo;                // 28h
-   PVOID ThreadLocalStoragePointer;    // 2Ch
-   PPEB Peb;                           // 30h
-   ULONG LastErrorValue;               // 34h
-   ULONG CountOfOwnedCriticalSections; // 38h
-   PVOID CsrClientThread;              // 3Ch
-   struct _W32THREAD* Win32ThreadInfo; // 40h
-   ULONG Win32ClientInfo[0x1F];        // 44h
-   PVOID WOW32Reserved;                // C0h
-   ULONG CurrentLocale;                // C4h
-   ULONG FpSoftwareStatusRegister;     // C8h
-   PVOID SystemReserved1[0x36];        // CCh
-   PVOID Spare1;                       // 1A4h
-   LONG ExceptionCode;                 // 1A8h
-   UCHAR SpareBytes1[0x28];            // 1ACh
-   PVOID SystemReserved2[0xA];         // 1D4h
-   GDI_TEB_BATCH GdiTebBatch;          // 1FCh
-   ULONG gdiRgn;                       // 6DCh
-   ULONG gdiPen;                       // 6E0h
-   ULONG gdiBrush;                     // 6E4h
-   CLIENT_ID RealClientId;             // 6E8h
-   PVOID GdiCachedProcessHandle;       // 6F0h
-   ULONG GdiClientPID;                 // 6F4h
-   ULONG GdiClientTID;                 // 6F8h
-   PVOID GdiThreadLocaleInfo;          // 6FCh
-   PVOID UserReserved[5];              // 700h
-   PVOID glDispatchTable[0x118];       // 714h
-   ULONG glReserved1[0x1A];            // B74h
-   PVOID glReserved2;                  // BDCh
-   PVOID glSectionInfo;                // BE0h
-   PVOID glSection;                    // BE4h
-   PVOID glTable;                      // BE8h
-   PVOID glCurrentRC;                  // BECh
-   PVOID glContext;                    // BF0h
-   NTSTATUS LastStatusValue;           // BF4h
-   UNICODE_STRING StaticUnicodeString; // BF8h
-   WCHAR StaticUnicodeBuffer[0x105];   // C00h
-   PVOID DeallocationStack;            // E0Ch
-   PVOID TlsSlots[0x40];               // E10h
-   LIST_ENTRY TlsLinks;                // F10h
-   PVOID Vdm;                          // F18h
-   PVOID ReservedForNtRpc;             // F1Ch
-   PVOID DbgSsReserved[0x2];           // F20h
-   ULONG HardErrorDisabled;            // F28h
-   PVOID Instrumentation[0x10];        // F2Ch
-   PVOID WinSockData;                  // F6Ch
-   ULONG GdiBatchCount;                // F70h
-   USHORT Spare2;                      // F74h
-   BOOLEAN IsFiber;                    // F76h
-   UCHAR Spare3;                       // F77h
-   ULONG Spare4;                       // F78h
-   ULONG Spare5;                       // F7Ch
-   PVOID ReservedForOle;               // F80h
-   ULONG WaitingOnLoaderLock;          // F84h
-   ULONG Unknown[11];                  // F88h
-   PVOID FlsSlots;                     // FB4h
-   PVOID WineDebugInfo;                // Needed for WINE DLL's
+   NT_TIB Tib;                         /* 00h */
+   PVOID EnvironmentPointer;           /* 1Ch */
+   CLIENT_ID Cid;                      /* 20h */
+   PVOID ActiveRpcInfo;                /* 28h */
+   PVOID ThreadLocalStoragePointer;    /* 2Ch */
+   PPEB Peb;                           /* 30h */
+   ULONG LastErrorValue;               /* 34h */
+   ULONG CountOfOwnedCriticalSections; /* 38h */
+   PVOID CsrClientThread;              /* 3Ch */
+   struct _W32THREAD* Win32ThreadInfo; /* 40h */
+   ULONG Win32ClientInfo[0x1F];        /* 44h */
+   PVOID WOW32Reserved;                /* C0h */
+   ULONG CurrentLocale;                /* C4h */
+   ULONG FpSoftwareStatusRegister;     /* C8h */
+   PVOID SystemReserved1[0x36];        /* CCh */
+   PVOID Spare1;                       /* 1A4h */
+   LONG ExceptionCode;                 /* 1A8h */
+   UCHAR SpareBytes1[0x28];            /* 1ACh */
+   PVOID SystemReserved2[0xA];         /* 1D4h */
+   GDI_TEB_BATCH GdiTebBatch;          /* 1FCh */
+   ULONG gdiRgn;                       /* 6DCh */
+   ULONG gdiPen;                       /* 6E0h */
+   ULONG gdiBrush;                     /* 6E4h */
+   CLIENT_ID RealClientId;             /* 6E8h */
+   PVOID GdiCachedProcessHandle;       /* 6F0h */
+   ULONG GdiClientPID;                 /* 6F4h */
+   ULONG GdiClientTID;                 /* 6F8h */
+   PVOID GdiThreadLocaleInfo;          /* 6FCh */
+   PVOID UserReserved[5];              /* 700h */
+   PVOID glDispatchTable[0x118];       /* 714h */
+   ULONG glReserved1[0x1A];            /* B74h */
+   PVOID glReserved2;                  /* BDCh */
+   PVOID glSectionInfo;                /* BE0h */
+   PVOID glSection;                    /* BE4h */
+   PVOID glTable;                      /* BE8h */
+   PVOID glCurrentRC;                  /* BECh */
+   PVOID glContext;                    /* BF0h */
+   NTSTATUS LastStatusValue;           /* BF4h */
+   UNICODE_STRING StaticUnicodeString; /* BF8h */
+   WCHAR StaticUnicodeBuffer[0x105];   /* C00h */
+   PVOID DeallocationStack;            /* E0Ch */
+   PVOID TlsSlots[0x40];               /* E10h */
+   LIST_ENTRY TlsLinks;                /* F10h */
+   PVOID Vdm;                          /* F18h */
+   PVOID ReservedForNtRpc;             /* F1Ch */
+   PVOID DbgSsReserved[0x2];           /* F20h */
+   ULONG HardErrorDisabled;            /* F28h */
+   PVOID Instrumentation[0x10];        /* F2Ch */
+   PVOID WinSockData;                  /* F6Ch */
+   ULONG GdiBatchCount;                /* F70h */
+   USHORT Spare2;                      /* F74h */
+   BOOLEAN IsFiber;                    /* F76h */
+   UCHAR Spare3;                       /* F77h */
+   ULONG Spare4;                       /* F78h */
+   ULONG Spare5;                       /* F7Ch */
+   PVOID ReservedForOle;               /* F80h */
+   ULONG WaitingOnLoaderLock;          /* F84h */
+   ULONG Unknown[11];                  /* F88h */
+   PVOID FlsSlots;                     /* FB4h */
+   PVOID WineDebugInfo;                /* Needed for WINE DLL's  */
 } TEB, *PTEB;
 
 /* FIXME: at least NtCurrentTeb should be defined in winnt.h */
diff --git a/reactos/include/napi/types.h b/reactos/include/napi/types.h
index 01560e1bcb6..0a65ce79f44 100644
--- a/reactos/include/napi/types.h
+++ b/reactos/include/napi/types.h
@@ -1,7 +1,7 @@
 #ifndef __INCLUDE_NAPI_TYPES_H
 #define __INCLUDE_NAPI_TYPES_H
 
-// these should be moved to a file like ntdef.h
+/* these should be moved to a file like ntdef.h */
 
 enum
 {
diff --git a/reactos/include/net/tdi.h b/reactos/include/net/tdi.h
index 183a6528d2e..a3b8c16686f 100644
--- a/reactos/include/net/tdi.h
+++ b/reactos/include/net/tdi.h
@@ -9,11 +9,11 @@
 
 /* FIXME: Missed some definitions in ntddk.h */
 
-/* Could be defined elsewhere */
-//#ifndef INT
-//typedef signed int INT, *PINT;
-//#endif
-
+/* Could be defined elsewhere 
+ * #ifndef INT
+ * typedef signed int INT, *PINT;
+ * #endif
+ */
 
 
 /* Basic types */
diff --git a/reactos/include/ntdll/ldr.h b/reactos/include/ntdll/ldr.h
index 56433266c3c..4b7062fe93e 100644
--- a/reactos/include/ntdll/ldr.h
+++ b/reactos/include/ntdll/ldr.h
@@ -16,8 +16,8 @@ typedef BOOL STDCALL
 typedef struct _LDR_MODULE
 {
    LIST_ENTRY     InLoadOrderModuleList;
-   LIST_ENTRY     InMemoryOrderModuleList;		// not used
-   LIST_ENTRY     InInitializationOrderModuleList;	// not used
+   LIST_ENTRY     InMemoryOrderModuleList;		/* not used */
+   LIST_ENTRY     InInitializationOrderModuleList;	/* not used */
    PVOID          BaseAddress;
    ULONG          EntryPoint;
    ULONG          SizeOfImage;
diff --git a/reactos/include/ntos.h b/reactos/include/ntos.h
index b8a5872d3c2..746974c1310 100644
--- a/reactos/include/ntos.h
+++ b/reactos/include/ntos.h
@@ -1,9 +1,12 @@
 #ifndef _NTOS_H
 #define _NTOS_H
-/* $Id: ntos.h,v 1.14 2003/08/14 18:30:27 silverblade Exp $ */
+/* $Id: ntos.h,v 1.15 2003/08/25 01:37:47 sedwards Exp $ */
 
 #if defined(NTOS_MODE_USER)
-// include windows.h before ntddk.h to get user mode prototype for InterlockedXxx functions
+/* 
+ * Include windows.h before ntddk.h to get user mode prototype 
+ * for InterlockedXxx functions.
+ */
 #include <windows.h>
 #include <ddk/ntddk.h>
 #include <ddk/ntifs.h>
@@ -14,7 +17,7 @@
 #include "ntos/except.h"
 #include "ntos/file.h"
 #include "ntos/gditypes.h"
-#include "ntos/fstypes.h"   // AG
+#include "ntos/fstypes.h"   /* AG */
 #include "ntos/heap.h"
 #include "ntos/kdbgsyms.h"
 #include "ntos/keyboard.h"
@@ -49,7 +52,7 @@
 #include "ntdll/trace.h"
 #include "rosrtl/thread.h"
 #include "kernel32/error.h"
-#else // Assume kernel mode
+#else /* Assume kernel mode */
 #include <ddk/ntddk.h>
 #include <ddk/ntifs.h>
 #include "ntos/types.h"
@@ -88,8 +91,8 @@
 #include "ntos/haltypes.h"
 #include "ntos/halfuncs.h"
 #include "ntos/kdfuncs.h"
-#include "ntos/kefuncs.h"   // AG
-#include "ntos/fstypes.h"   // AG
+#include "ntos/kefuncs.h"   /* AG */
+#include "ntos/fstypes.h"   /* AG */
 #include "ntos/obtypes.h"
 #include "ntos/tss.h"
 #include "rosrtl/thread.h"
diff --git a/reactos/include/ntos/disk.h b/reactos/include/ntos/disk.h
index 80a2d3f5dac..40f583444ee 100644
--- a/reactos/include/ntos/disk.h
+++ b/reactos/include/ntos/disk.h
@@ -1,4 +1,4 @@
-/* $Id: disk.h,v 1.14 2003/08/14 18:30:27 silverblade Exp $
+/* $Id: disk.h,v 1.15 2003/08/25 01:37:47 sedwards Exp $
  *
  * COPYRIGHT:    See COPYING in the top level directory
  * PROJECT:      ReactOS kernel
@@ -77,7 +77,7 @@
 #define PTOLDDOS16Bit                   0x04
 #define PTDosExtended                   0x05
 #define PTDos5xPrimary                  0x06
-#define PTIfs                           0x07	// e.g.: HPFS, NTFS, etc
+#define PTIfs                           0x07	/* e.g.: HPFS, NTFS, etc */
 #define PTAIX                           0x08
 #define PTAIXBootable                   0x09
 #define PTOS2BootMgr                    0x0A
diff --git a/reactos/include/ntos/except.h b/reactos/include/ntos/except.h
index 10e9537001e..753d50a4538 100644
--- a/reactos/include/ntos/except.h
+++ b/reactos/include/ntos/except.h
@@ -14,7 +14,7 @@ typedef enum {
 	ExceptionContinueSearch,
 	ExceptionNestedException,
 	ExceptionCollidedUnwind,
-  ExceptionDismiss  // ???
+  ExceptionDismiss  /* ??? */
 } EXCEPTION_DISPOSITION;
 
 
@@ -107,17 +107,17 @@ typedef PEXCEPTION_REGISTRATION PEXCEPTION_REGISTRATION_RECORD;
 
 #if 1
 
-// Runtime DLL structures
+/* Runtime DLL structures */
 
 #ifndef _GNU_H_WINDOWS32_DEFINES
 #ifdef __NTOSKRNL__
 #define EXCEPTION_EXECUTE_HANDLER     1
 #define EXCEPTION_CONTINUE_SEARCH     0
-// #define EXCEPTION_CONTINUE_EXECUTION -1
+/* #define EXCEPTION_CONTINUE_EXECUTION -1 */
 #endif /* __NTOSKRNL__ */
 #endif /* _GNU_H_WINDOWS32_DEFINES */
 
-// Functions of the following prototype return one of the above constants
+/* Functions of the following prototype return one of the above constants */
 #ifdef __GNUC__
 typedef DWORD CDECL (*PSCOPE_EXCEPTION_FILTER)(VOID);
 typedef VOID CDECL (*PSCOPE_EXCEPTION_HANDLER)(VOID);
diff --git a/reactos/include/ntos/rtl.h b/reactos/include/ntos/rtl.h
index a510e7f84fe..34b792e33f1 100755
--- a/reactos/include/ntos/rtl.h
+++ b/reactos/include/ntos/rtl.h
@@ -1,4 +1,4 @@
-/* $Id: rtl.h,v 1.16 2003/08/14 17:54:27 ekohl Exp $
+/* $Id: rtl.h,v 1.17 2003/08/25 01:37:47 sedwards Exp $
  * 
  */
 
@@ -451,7 +451,7 @@ RtlZeroMemory (PVOID Destination, ULONG Length);
 #define RTL_REGISTRY_WINDOWS_NT 3
 #define RTL_REGISTRY_DEVICEMAP  4
 #define RTL_REGISTRY_USER       5
-#define RTL_REGISTRY_ENUM       6   // ReactOS specific: Used internally in kernel only
+#define RTL_REGISTRY_ENUM       6   /* ReactOS specific: Used internally in kernel only */
 #define RTL_REGISTRY_MAXIMUM    7
 
 #define RTL_REGISTRY_HANDLE     0x40000000
@@ -807,8 +807,8 @@ STDCALL
 RtlCreateHeap (
 	ULONG			Flags,
 	PVOID			BaseAddress,
-	ULONG			SizeToReserve,     // dwMaximumSize
-	ULONG			SizeToCommit,      // dwInitialSize
+	ULONG			SizeToReserve,     /* dwMaximumSize */
+	ULONG			SizeToCommit,      /* dwInitialSize */
 	PVOID			Unknown,
 	PRTL_HEAP_DEFINITION	Definition
 	);
diff --git a/reactos/include/ntos/rtltypes.h b/reactos/include/ntos/rtltypes.h
index 0a14e803691..55453274fb9 100755
--- a/reactos/include/ntos/rtltypes.h
+++ b/reactos/include/ntos/rtltypes.h
@@ -1,4 +1,4 @@
-/* $Id: rtltypes.h,v 1.9 2003/07/23 15:30:53 gvg Exp $
+/* $Id: rtltypes.h,v 1.10 2003/08/25 01:37:47 sedwards Exp $
  * 
  */
 
@@ -159,7 +159,7 @@ typedef struct _RTL_ATOM_TABLE
 typedef struct _CPTABLEINFO
 {
   USHORT  CodePage;
-  USHORT  MaximumCharacterSize;  // SBCS = 1, DBCS = 2
+  USHORT  MaximumCharacterSize;  /* SBCS = 1, DBCS = 2 */
   USHORT  DefaultChar;
   USHORT  UniDefaultChar;
   USHORT  TransDefaultChar;
@@ -184,7 +184,7 @@ typedef struct _NLS_FILE_HEADER
 {
   USHORT  HeaderSize;
   USHORT  CodePage;
-  USHORT  MaximumCharacterSize;  // SBCS = 1, DBCS = 2
+  USHORT  MaximumCharacterSize;  /* SBCS = 1, DBCS = 2 */
   USHORT  DefaultChar;
   USHORT  UniDefaultChar;
   USHORT  TransDefaultChar;
diff --git a/reactos/include/ntos/security.h b/reactos/include/ntos/security.h
index 71956c48f7b..104e35a83f7 100644
--- a/reactos/include/ntos/security.h
+++ b/reactos/include/ntos/security.h
@@ -45,7 +45,7 @@
 #define SE_SELF_RELATIVE	(32768)
 #endif
 
-// This is defined in the Win 32 API headers as something else:
+/* This is defined in the Win 32 API headers as something else: */
 typedef ULONG ACCESS_MODE, *PACCESS_MODE;
 
 #if 0
diff --git a/reactos/include/ntos/service.h b/reactos/include/ntos/service.h
index 3b27b77a5cc..0be2457f5bc 100755
--- a/reactos/include/ntos/service.h
+++ b/reactos/include/ntos/service.h
@@ -11,12 +11,12 @@
 
 #pragma pack(1)
 
-// System Service Dispatch Table
+/* System Service Dispatch Table */
 typedef struct t_SSDT {
                 ULONG           SysCallPtr;
 } SSDT, *PSSDT;
 
-// System Service Parameters Table
+/* System Service Parameters Table */
 typedef struct t_SSPT   {
                 unsigned int    ParamBytes;
 } SSPT, *PSSPT;
diff --git a/reactos/include/ntos/types.h b/reactos/include/ntos/types.h
index 01e8554f89f..58e7a381bfd 100644
--- a/reactos/include/ntos/types.h
+++ b/reactos/include/ntos/types.h
@@ -90,12 +90,13 @@ typedef __WCHAR_TYPE__      wchar_t;
 #endif  /* wchar_t not already defined */
 
 
-//#ifndef __cplusplus
-//#ifndef _WCHAR_T_DEFINED
-//#define _WCHAR_T_DEFINED
-//typedef unsigned short wchar_t;
-//#endif
-//#endif
+/* #ifndef __cplusplus
+#ifndef _WCHAR_T_DEFINED
+#define _WCHAR_T_DEFINED
+typedef unsigned short wchar_t;
+#endif
+#endif
+*/
 
 typedef unsigned char UCHAR;
 typedef unsigned short USHORT;
@@ -115,7 +116,7 @@ typedef float *PFLOAT;
 typedef wchar_t *PWCH;
 typedef unsigned short *PWORD;
 
-#include <msvcrt/crttypes.h> // for definition of LONGLONG, PLONGLONG etc
+#include <msvcrt/crttypes.h> /* for definition of LONGLONG, PLONGLONG etc */
 
 typedef const void *LPCVOID;
 typedef BYTE *LPBYTE, *PBYTE;
@@ -178,9 +179,10 @@ typedef union _ULARGE_INTEGER
 } ULARGE_INTEGER, *PULARGE_INTEGER;
 
 
-// Moved here by AG
-// typedef ULARGE_INTEGER TIME, *PTIME;
-
+/* 
+ * Moved here by AG
+ * typedef ULARGE_INTEGER TIME, *PTIME;
+ */
 
 typedef struct _FILETIME
 {
@@ -421,7 +423,7 @@ typedef struct value_ent
   DWORD  ve_type;
 } WVALENT, *PWVALENT;
 
-//#include "except.h"
+/* #include "except.h" */
 
 #ifndef __USE_W32API
 
diff --git a/reactos/include/ole32/guiddef.h b/reactos/include/ole32/guiddef.h
index 81a827bce42..ae24dc909cf 100644
--- a/reactos/include/ole32/guiddef.h
+++ b/reactos/include/ole32/guiddef.h
@@ -42,7 +42,7 @@ Cambridge, MA 02139, USA.
 #endif
 
 
-//	guid definition
+/*	guid definition */
 #ifndef _GUID_DEFINED
 	#define _GUID_DEFINED
 	typedef struct _GUID {
@@ -56,7 +56,7 @@ Cambridge, MA 02139, USA.
 #endif
 
 
-//	guid definition macro
+/*	guid definition macro */
 #ifdef DEFINE_GUID
 	#undef DEFINE_GUID
 #endif
@@ -74,7 +74,7 @@ Cambridge, MA 02139, USA.
 #endif
 
 
-//	IID section
+/*	IID section */
 typedef	GUID		IID;
 typedef	IID*		LPIID;
 #ifndef IsEqualIID
@@ -82,20 +82,20 @@ typedef	IID*		LPIID;
 #endif
 
 
-//	CLSID section
+/*	CLSID section */
 typedef GUID		CLSID;
 typedef CLSID*		LPCLSID;
 #ifndef IsEqualCLSID
 #define IsEqualCLSID(rclsid1, rclsid2) IsEqualGUID(rclsid1, rclsid2)
 #endif
 
-//	FMTID
+/*	FMTID */
 typedef	GUID		FMTID;
 typedef	FMTID*		LPFMTID;
 #define	IsEqualFMTID(rfmtid1, rfmtid2) IsEqualGUID(rfmtid1, rfmtid2)
 
 
-//	REFGUID section
+/*	REFGUID section */
 #ifndef _REFGUID_DEFINED
 	#define _REFGUID_DEFINED
 	#ifdef __cplusplus
@@ -105,7 +105,7 @@ typedef	FMTID*		LPFMTID;
 	#endif
 #endif
 
-//	REFIID section
+/*	REFIID section */
 #ifndef _REFIID_DEFINED
 	#define _REFIID_DEFINED
 	#ifdef __cplusplus
@@ -115,7 +115,7 @@ typedef	FMTID*		LPFMTID;
 	#endif
 #endif
 
-//	REFCLSID section
+/*	REFCLSID section */
 #ifndef _REFCLSID_DEFINED
 	#define _REFCLSID_DEFINED
 	#ifdef __cplusplus
@@ -125,7 +125,7 @@ typedef	FMTID*		LPFMTID;
 	#endif
 #endif
 
-//	REFFMTID section
+/*	REFFMTID section */
 #ifndef _REFFMTID_DEFINED
 	#define _REFFMTID_DEFINED
 	#ifdef __cplusplus
@@ -136,9 +136,9 @@ typedef	FMTID*		LPFMTID;
 #endif
 
 
-//	compare functions for GUID
+/*	compare functions for GUID */
 #ifdef __cplusplus
-	//	cpp versions
+	/*	cpp versions */
 	__inline int InlineIsEqualGUID(REFGUID rguid1, REFGUID rguid2)
 	{
 		return(((unsigned long *) &rguid1)[0] == ((unsigned long *) &rguid2)[0] &&
@@ -151,7 +151,7 @@ typedef	FMTID*		LPFMTID;
 		return !memcmp(&rguid1, &rguid2, sizeof(GUID));
 	}
 #else
-	//	c versions
+	/*	c versions */
 	#define InlineIsEqualGUID(rguid1, rguid2)									\
 		(((unsigned long *) rguid1)[0] == ((unsigned long *) rguid2)[0] &&		\
 		((unsigned long *) rguid1)[1] == ((unsigned long *) rguid2)[1] &&		\
@@ -161,13 +161,13 @@ typedef	FMTID*		LPFMTID;
 	#define IsEqualGUID(rguid1, rguid2) (!memcmp(rguid1, rguid2, sizeof(GUID)))
 #endif
 
-//	use the inline version???
+/*	use the inline version??? */
 #ifdef __INLINE_ISEQUAL_GUID
 	#define IsEqualGUID(rguid1, rguid2)	InlineIsEqualGUID(rguid1, rguid2)
 #endif
 
 
-//	compare functions for IID CLSID
+/*	compare functions for IID CLSID */
 #ifndef IsEqualIID
 #define IsEqualIID(riid1, riid2) IsEqualGUID(riid1, riid2)
 #endif
@@ -175,7 +175,7 @@ typedef	FMTID*		LPFMTID;
 #define IsEqualCLSID(rclsid1, rclsid2) IsEqualGUID(rclsid1, rclsid2)
 #endif
 
-//	c++ helper functions
+/*	c++ helper functions */
 #if !defined _SYS_GUID_OPERATOR_EQ_ && !defined _NO_SYS_GUID_OPERATOR_EQ_
 	#define _SYS_GUID_OPERATOR_EQ_
 	#ifdef __cplusplus
diff --git a/reactos/include/ole32/obj_base.h b/reactos/include/ole32/obj_base.h
index da69ab5433b..a453a7b701c 100644
--- a/reactos/include/ole32/obj_base.h
+++ b/reactos/include/ole32/obj_base.h
@@ -108,11 +108,11 @@ INT WINAPI StringFromGUID2(REFGUID id, LPOLESTR str, INT cmax);
  *    #undef ICOM_INTERFACE
  *
  *    #ifdef ICOM_CINTERFACE
- *    // *** IUnknown methods *** //
+ *     *** IUnknown methods *** 
  *    #define IDirect3D_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
  *    #define IDirect3D_AddRef(p)             ICOM_CALL (AddRef,p)
  *    #define IDirect3D_Release(p)            ICOM_CALL (Release,p)
- *    // *** IDirect3D methods *** //
+ *     *** IDirect3D methods *** 
  *    #define IDirect3D_Initialize(p,a)       ICOM_CALL1(Initialize,p,a)
  *    #define IDirect3D_EnumDevices(p,a,b)    ICOM_CALL2(EnumDevice,p,a,b)
  *    #define IDirect3D_CreateLight(p,a,b)    ICOM_CALL2(CreateLight,p,a,b)
@@ -178,11 +178,11 @@ INT WINAPI StringFromGUID2(REFGUID id, LPOLESTR str, INT cmax);
  *    }; 
  *
  *    #ifdef ICOM_CINTERFACE
- *    // *** IUnknown methods *** //
+ *     *** IUnknown methods *** 
  *    #define IDirect3D_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b)
  *    #define IDirect3D_AddRef(p)             (p)->lpVtbl->AddRef(p)
  *    #define IDirect3D_Release(p)            (p)->lpVtbl->Release(p)
- *    // *** IDirect3D methods *** //
+ *     *** IDirect3D methods *** 
  *    #define IDirect3D_Initialize(p,a)       (p)->lpVtbl->Initialize(p,a)
  *    #define IDirect3D_EnumDevices(p,a,b)    (p)->lpVtbl->EnumDevice(p,a,b)
  *    #define IDirect3D_CreateLight(p,a,b)    (p)->lpVtbl->CreateLight(p,a,b)
@@ -263,21 +263,21 @@ INT WINAPI StringFromGUID2(REFGUID id, LPOLESTR str, INT cmax);
  *
  *    typedef struct _IDirect3D {
  *        void* lpVtbl;
- *        // ...
+ *         ...
  *
  *    } _IDirect3D;
  *
  *    static ICOM_VTABLE(IDirect3D) d3dvt;
  *
- *    // implement the IDirect3D methods here
+ *    ***implement the IDirect3D methods here****
  *
  *    int IDirect3D_QueryInterface(IDirect3D* me)
  *    {
  *        ICOM_THIS(IDirect3D,me);
- *        // ...
+ *        ...
  *    }
  *
- *    // ...
+ *       ...
  *
  *    static ICOM_VTABLE(IDirect3D) d3dvt = {
  *        ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
diff --git a/reactos/include/ole32/objbase.h b/reactos/include/ole32/objbase.h
index d2f7cf7672f..15c2f01c9e9 100644
--- a/reactos/include/ole32/objbase.h
+++ b/reactos/include/ole32/objbase.h
@@ -54,7 +54,7 @@ Cambridge, MA 02139, USA.
 #define	STDMETHODIMP_(type)		type STDMETHODCALLTYPE
 
 
-//	variable argument lists versions
+/*	variable argument lists versions */
 #define STDAPIV                 EXTERN_C HRESULT STDAPIVCALLTYPE
 #define STDAPIV_(type)          EXTERN_C type STDAPIVCALLTYPE
 
@@ -66,20 +66,20 @@ Cambridge, MA 02139, USA.
 	#define WINOLEAPI_(type) STDAPI_(type)
 #endif
 
-//
-//	COM interface declaration macros [from the wine implementation
-//
-//	These macros declare interfaces for both C and C++ depending for what
-//	language you are compiling
-//
-//	DECLARE_INTERFACE(iface): declare not derived interface
-//	DECLARE_INTERFACE(iface, baseiface): declare derived interface
-//
-//	Use CINTERFACE if you want to force a c style interface declaration,
-//	else, the compiler will look at the source file extension
-//
+/*
+ *	COM interface declaration macros [from the wine implementation
+ *
+ *	These macros declare interfaces for both C and C++ depending for what
+ *	language you are compiling
+ *
+ *	DECLARE_INTERFACE(iface): declare not derived interface
+ *	DECLARE_INTERFACE(iface, baseiface): declare derived interface
+ *
+ *	Use CINTERFACE if you want to force a c style interface declaration,
+ *	else, the compiler will look at the source file extension
+ */
 #if	defined(__cplusplus) && !defined(CINTERFACE)
-	//	define the c++ macros
+	/*	define the c++ macros */
 	#define interface					struct
 	#define STDMETHOD(method)			virtual	HRESULT	STDMETHODCALLTYPE	method
 	#define STDMETHOD_(type,method)		virtual type	STDMETHODCALLTYPE	method
@@ -92,7 +92,7 @@ Cambridge, MA 02139, USA.
 	#define DECLARE_INTERFACE_(iface, baseiface)	interface iface : public baseiface
 
 #else
-	//	define the c macros
+	/*	define the c macros */
 	#define	interface				struct
 	#define	STDMETHOD(method)		HRESULT	(STDMETHODCALLTYPE*		method)
 	#define	STDMETHOD_(type,method)	type	(STDMETHODCALLTYPE*		method)
diff --git a/reactos/include/ole32/olectl.h b/reactos/include/ole32/olectl.h
index f0315970f9d..2c1ef57724b 100644
--- a/reactos/include/ole32/olectl.h
+++ b/reactos/include/ole32/olectl.h
@@ -29,6 +29,6 @@ Cambridge, MA 02139, USA.
 ********************************************************************/
 #include <ole32\objbase.h>
 
-//	Dll register functions
+/*	Dll register functions */
 STDAPI DllRegisterServer(void);
 STDAPI DllUnregisterServer(void);
\ No newline at end of file
diff --git a/reactos/include/ole32/rpc.h b/reactos/include/ole32/rpc.h
index 5cec503db19..d85d7cdda21 100644
--- a/reactos/include/ole32/rpc.h
+++ b/reactos/include/ole32/rpc.h
@@ -40,6 +40,6 @@ RPC_STATUS RPC_ENTRY UuidCreate(UUID *Uuid);
 /* #include "rpcnsi.h" */
 /* #include "rpcnterr.h" */
 /* #include "excpt.h" */
-//#include "winerror.h"
+/* #include "winerror.h" */
 
 #endif /*__WINE_RPC_H */
diff --git a/reactos/include/ole32/winerror.h b/reactos/include/ole32/winerror.h
index ac9a181e614..f454f062b53 100644
--- a/reactos/include/ole32/winerror.h
+++ b/reactos/include/ole32/winerror.h
@@ -30,21 +30,21 @@ Cambridge, MA 02139, USA.
 #ifndef _WINERROR_H
 #define _WINERROR_H
 #if 0
-//
-//	Return Code macros
-//
+/*
+ *	Return Code macros
+ */
 #define	SUCCEEDED(Status)	((HRESULT)(Status) >= 0)
 #define	FAILED(Status)		((HRESULT)(Status)<0)
 
-//
-//	Success Codes
-//
+/*
+ *	Success Codes
+ */
 #define S_OK						0x00000000L
 #define S_FALSE						0x00000001L
 
-//
-//	Error Codes
-//
+/*
+ *	Error Codes
+ */
 #define E_NOINTERFACE				0x80000004L
 #define E_POINTER					0x80004003L
 #define	E_FAIL						0x80004005L
diff --git a/reactos/include/reactos/config.h b/reactos/include/reactos/config.h
index e90b707b827..f1f4e773497 100644
--- a/reactos/include/reactos/config.h
+++ b/reactos/include/reactos/config.h
@@ -1,6 +1,6 @@
 #ifndef _INC_REACTOS_CONFIG_H
 #define _INC_REACTOS_CONFIG_H 
-/* $Id: config.h,v 1.3 2000/02/20 22:52:47 ea Exp $ */
+/* $Id: config.h,v 1.4 2003/08/25 01:37:47 sedwards Exp $ */
 /* ReactOS global configuration options */
 
 #define CONFIG_PROCESSOR_FAMILY_I386	386L
@@ -24,7 +24,9 @@
  * Use __fastcall calling conventions when needed
  * in system components that require it.
  */
-//#define CONFIG_USE_FASTCALL
+
+/* #define CONFIG_USE_FASTCALL */
+
 /*
  * Enable debugging output on a per module
  * base.
diff --git a/reactos/include/win32k/bitmaps.h b/reactos/include/win32k/bitmaps.h
index 02e71bec693..0a543264edb 100644
--- a/reactos/include/win32k/bitmaps.h
+++ b/reactos/include/win32k/bitmaps.h
@@ -8,8 +8,8 @@
 typedef struct _DDBITMAP
 {
   const PDRIVER_FUNCTIONS  pDriverFunctions;
-//  DHPDEV  PDev;
-//  HSURF  Surface;
+/*  DHPDEV  PDev; */
+/*  HSURF  Surface; */
 } DDBITMAP;
 
 /* GDI logical bitmap object */
diff --git a/reactos/include/win32k/color.h b/reactos/include/win32k/color.h
index c522ed7bb25..c78610ab4fb 100644
--- a/reactos/include/win32k/color.h
+++ b/reactos/include/win32k/color.h
@@ -4,9 +4,9 @@
 #ifndef CLR_INVALID
 #define CLR_INVALID         0xffffffff
 #endif
-#define PC_SYS_USED     0x80		// palentry is used (both system and logical)
-#define PC_SYS_RESERVED 0x40		// system palentry is not to be mapped to
-#define PC_SYS_MAPPED   0x10		// logical palentry is a direct alias for system palentry
+#define PC_SYS_USED     0x80		/* palentry is used (both system and logical) */
+#define PC_SYS_RESERVED 0x40		/* system palentry is not to be mapped to */
+#define PC_SYS_MAPPED   0x10		/* logical palentry is a direct alias for system palentry */
 
 BOOL
 STDCALL
diff --git a/reactos/include/win32k/dc.h b/reactos/include/win32k/dc.h
index 551cec1fea5..a20d9878a2e 100644
--- a/reactos/include/win32k/dc.h
+++ b/reactos/include/win32k/dc.h
@@ -19,12 +19,12 @@ typedef struct _WIN_DC_INFO
   HBITMAP  hBitmap;
   HBITMAP  hFirstBitmap; /* Bitmap selected at creation of the DC */
 
-// #if 0
+/* #if 0 */
     HANDLE      hDevice;
     HPALETTE    hPalette;
 
     GdiPath       path;
-// #endif
+/* #endif */
 
   WORD  ROPmode;
   WORD  polyFillMode;
diff --git a/reactos/include/win32k/math.h b/reactos/include/win32k/math.h
index 30ef7217b2e..eff179bc442 100644
--- a/reactos/include/win32k/math.h
+++ b/reactos/include/win32k/math.h
@@ -18,12 +18,12 @@
  *  DISCLAMED. This includes but is not limited to warranties of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $Revision: 1.3 $
- * $Author: chorns $
- * $Date: 2003/08/24 10:00:12 $
+ * $Revision: 1.4 $
+ * $Author: sedwards $
+ * $Date: 2003/08/25 01:37:48 $
  *
  */
-// added modfl 
+/* added modfl */
 
 #ifndef _MATH_H_
 #define _MATH_H_
diff --git a/reactos/include/win32k/region.h b/reactos/include/win32k/region.h
index 840a3c79474..89d1135453c 100644
--- a/reactos/include/win32k/region.h
+++ b/reactos/include/win32k/region.h
@@ -4,7 +4,7 @@
 
 #include <win32k/gdiobj.h>
 
-//Internal region data. Can't use RGNDATA structure because buffer is allocated statically
+/* Internal region data. Can't use RGNDATA structure because buffer is allocated statically */
 typedef struct _ROSRGNDATA {
   RGNDATAHEADER rdh;
   char*          Buffer;
diff --git a/reactos/include/windows.h b/reactos/include/windows.h
index 27dfb01bf91..6d107712b05 100644
--- a/reactos/include/windows.h
+++ b/reactos/include/windows.h
@@ -104,7 +104,7 @@
    using Objective-C then you must use WINBOOL for Win32 operations.
 */
 #ifndef __OBJC__
-//typedef WINBOOL BOOL;
+/* typedef WINBOOL BOOL; */
 #endif /* !__OBJC__ */
 
 /* How do we get the VM page size on NT? */
diff --git a/reactos/include/wine/windef16.h b/reactos/include/wine/windef16.h
index b3c1f01b9bb..990121f3802 100644
--- a/reactos/include/wine/windef16.h
+++ b/reactos/include/wine/windef16.h
@@ -23,7 +23,7 @@
 #ifndef __WINE_WINDEF16_H
 #define __WINE_WINDEF16_H
 
-// #include "windef.h"
+/* #include "windef.h" */
 
 /* Standard data types */
 
diff --git a/reactos/include/winsock2.h b/reactos/include/winsock2.h
index 72ee035c2d7..8bb85cc6455 100644
--- a/reactos/include/winsock2.h
+++ b/reactos/include/winsock2.h
@@ -385,17 +385,17 @@ extern INT PASCAL FAR __WSAFDIsSet(SOCKET, fd_set FAR*);
 
 
 typedef struct _WSAOVERLAPPED {
-    DWORD Internal;     // reserved
-    DWORD InternalHigh; // reserved
-    DWORD Offset;       // reserved
-    DWORD OffsetHigh;   // reserved
+    DWORD Internal;     /* reserved */
+    DWORD InternalHigh; /* reserved */
+    DWORD Offset;       /* reserved */
+    DWORD OffsetHigh;   /* reserved */
     WSAEVENT hEvent;
 } WSAOVERLAPPED, FAR* LPWSAOVERLAPPED;
 
 
 typedef struct __WSABUF {
-    ULONG len;     // buffer length
-    CHAR FAR* buf; // pointer to buffer
+    ULONG len;     /* buffer length */
+    CHAR FAR* buf; /* pointer to buffer */
 } WSABUF, FAR* LPWSABUF;
 
 
@@ -561,12 +561,12 @@ struct servent {
     CHAR FAR* s_proto;
 };
 
-// It is assumed here that a network number fits in 32 bits.
+/* It is assumed here that a network number fits in 32 bits. */
 struct netent {
-    CHAR FAR* n_name;               // official net name
-    CHAR FAR* FAR* n_aliases;       // list of alias's
-    SHORT n_addrtype;               // network address type id
-    ULONG n_net;                    // network number
+    CHAR FAR* n_name;               /* official net name */
+    CHAR FAR* FAR* n_aliases;       /* list of alias's */
+    SHORT n_addrtype;               /* network address type id */
+    ULONG n_net;                    /* network number */
 };