diff --git a/reactos/drivers/filesystems/fs_rec/blockdev.c b/reactos/drivers/filesystems/fs_rec/blockdev.c
index d76d7d8b1fc..a89dd8b36bc 100644
--- a/reactos/drivers/filesystems/fs_rec/blockdev.c
+++ b/reactos/drivers/filesystems/fs_rec/blockdev.c
@@ -10,6 +10,10 @@
 /* INCLUDES *****************************************************************/
 
 #include "fs_rec.h"
+
+#include <ntdddisk.h>
+#include <ntddcdrm.h>
+
 #define NDEBUG
 #include <debug.h>
 
@@ -221,4 +225,3 @@ FsRecReadBlock(IN PDEVICE_OBJECT DeviceObject,
     /* All went well */
     return TRUE;
 }
-
diff --git a/reactos/drivers/filesystems/fs_rec/cdfs.c b/reactos/drivers/filesystems/fs_rec/cdfs.c
index 5b2fbb46167..2f097d923e6 100644
--- a/reactos/drivers/filesystems/fs_rec/cdfs.c
+++ b/reactos/drivers/filesystems/fs_rec/cdfs.c
@@ -10,6 +10,7 @@
 /* INCLUDES *****************************************************************/
 
 #include "fs_rec.h"
+
 #define NDEBUG
 #include <debug.h>
 
diff --git a/reactos/drivers/filesystems/fs_rec/ext2.c b/reactos/drivers/filesystems/fs_rec/ext2.c
index 46a6f43a42e..d940253247c 100644
--- a/reactos/drivers/filesystems/fs_rec/ext2.c
+++ b/reactos/drivers/filesystems/fs_rec/ext2.c
@@ -9,6 +9,7 @@
 /* INCLUDES *****************************************************************/
 
 #include "fs_rec.h"
+
 #define NDEBUG
 #include <debug.h>
 
diff --git a/reactos/drivers/filesystems/fs_rec/fat.c b/reactos/drivers/filesystems/fs_rec/fat.c
index b63a4be6fbf..804eb94e152 100644
--- a/reactos/drivers/filesystems/fs_rec/fat.c
+++ b/reactos/drivers/filesystems/fs_rec/fat.c
@@ -10,6 +10,7 @@
 /* INCLUDES *****************************************************************/
 
 #include "fs_rec.h"
+
 #define NDEBUG
 #include <debug.h>
 
diff --git a/reactos/drivers/filesystems/fs_rec/fs_rec.c b/reactos/drivers/filesystems/fs_rec/fs_rec.c
index a12d6bfd8b9..00b0a67b103 100644
--- a/reactos/drivers/filesystems/fs_rec/fs_rec.c
+++ b/reactos/drivers/filesystems/fs_rec/fs_rec.c
@@ -10,6 +10,7 @@
 /* INCLUDES *****************************************************************/
 
 #include "fs_rec.h"
+
 #define NDEBUG
 #include <debug.h>
 
diff --git a/reactos/drivers/filesystems/fs_rec/fs_rec.h b/reactos/drivers/filesystems/fs_rec/fs_rec.h
index 628bf228c75..fc25efc7312 100644
--- a/reactos/drivers/filesystems/fs_rec/fs_rec.h
+++ b/reactos/drivers/filesystems/fs_rec/fs_rec.h
@@ -7,36 +7,23 @@
  *                   Eric Kohl
  */
 
-//
-// IFS Headers
-//
 #include <ntifs.h>
-#include <ntdddisk.h>
-#include <ntddcdrm.h>
 
-//
-// Tag for memory allocations
-//
+/* Tag for memory allocations */
 #define FSREC_TAG 'cRsF'
 
-//
-// UDFS Offsets
-//
+/* UDFS Offsets */
 #define UDFS_VRS_START_OFFSET  32768
 #define UDFS_AVDP_SECTOR       256
 
-//
-// Non-standard rounding macros
-//
+/* Non-standard rounding macros */
 #define ROUND_UP(n, align) \
     ROUND_DOWN(((ULONG)n) + (align) - 1, (align))
 
 #define ROUND_DOWN(n, align) \
     (((ULONG)n) & ~((align) - 1l))
 
-//
-// Conversion types and macros taken from internal ntifs headers
-//
+/* Conversion types and macros taken from internal ntifs headers */
 typedef union _UCHAR1
 {
     UCHAR Uchar[1];
@@ -82,9 +69,7 @@ typedef union _UCHAR4
     CopyUchar4(&(Bios)->LargeSectors,      &(Pbios)->LargeSectors[0]     ); \
 }
 
-//
-// Packed versions of the BPB and Boot Sector
-//
+/* Packed versions of the BPB and Boot Sector */
 typedef struct _PACKED_BIOS_PARAMETER_BLOCK
 {
     UCHAR BytesPerSector[2];
@@ -114,9 +99,7 @@ typedef struct _PACKED_BOOT_SECTOR
     UCHAR SystemId[8];
 } PACKED_BOOT_SECTOR, *PPACKED_BOOT_SECTOR;
 
-//
-// Unpacked version of the BPB
-//
+/* Unpacked version of the BPB */
 typedef struct BIOS_PARAMETER_BLOCK
 {
     USHORT BytesPerSector;
@@ -149,9 +132,7 @@ typedef struct BIOS_PARAMETER_BLOCK
     USHORT BackupBootSector;
 } BIOS_PARAMETER_BLOCK, *PBIOS_PARAMETER_BLOCK;
 
-//
-// UDFS Structures
-//
+/* UDFS Structures */
 #include <pshpack1.h>
 typedef struct _TAG
 {
@@ -179,9 +160,7 @@ typedef struct _AVDP
 } AVDP, *PAVDP;
 #include <poppack.h>
 
-//
-// Filesystem Types
-//
+/* Filesystem Types */
 typedef enum _FILE_SYSTEM_TYPE
 {
     FS_TYPE_UNUSED,
@@ -192,9 +171,7 @@ typedef enum _FILE_SYSTEM_TYPE
     FS_TYPE_EXT2,
 } FILE_SYSTEM_TYPE, *PFILE_SYSTEM_TYPE;
 
-//
-// FS Recognizer State
-//
+/* FS Recognizer State */
 typedef enum _FS_REC_STATE
 {
     Pending,
@@ -202,9 +179,7 @@ typedef enum _FS_REC_STATE
     Unloading
 } FS_REC_STATE, *PFS_REC_STATE;
 
-//
-// Device extension
-//
+/* Device extension */
 typedef struct _DEVICE_EXTENSION
 {
     FS_REC_STATE State;
@@ -212,9 +187,7 @@ typedef struct _DEVICE_EXTENSION
     PDEVICE_OBJECT Alternate;
 } DEVICE_EXTENSION, *PDEVICE_EXTENSION;
 
-//
-// Prototypes
-//
+/* Prototypes */
 NTSTATUS
 NTAPI
 FsRecCdfsFsControl(
diff --git a/reactos/drivers/filesystems/fs_rec/ntfs.c b/reactos/drivers/filesystems/fs_rec/ntfs.c
index 11ae4c74b53..69066d2dbe2 100644
--- a/reactos/drivers/filesystems/fs_rec/ntfs.c
+++ b/reactos/drivers/filesystems/fs_rec/ntfs.c
@@ -10,6 +10,7 @@
 /* INCLUDES *****************************************************************/
 
 #include "fs_rec.h"
+
 #define NDEBUG
 #include <debug.h>
 
diff --git a/reactos/drivers/filesystems/fs_rec/udfs.c b/reactos/drivers/filesystems/fs_rec/udfs.c
index fb9f653f538..ec002b7420b 100644
--- a/reactos/drivers/filesystems/fs_rec/udfs.c
+++ b/reactos/drivers/filesystems/fs_rec/udfs.c
@@ -10,6 +10,7 @@
 /* INCLUDES *****************************************************************/
 
 #include "fs_rec.h"
+
 #define NDEBUG
 #include <debug.h>