diff --git a/reactos/drivers/filesystems/fastfat/blockdev.c b/reactos/drivers/filesystems/fastfat/blockdev.c
index cada3d81421..f0ff0598c2e 100644
--- a/reactos/drivers/filesystems/fastfat/blockdev.c
+++ b/reactos/drivers/filesystems/fastfat/blockdev.c
@@ -23,6 +23,8 @@ VfatReadWritePartialCompletion (IN PDEVICE_OBJECT DeviceObject,
   PVFAT_IRP_CONTEXT IrpContext;
   PMDL Mdl;
 
+  UNREFERENCED_PARAMETER(DeviceObject);
+
   DPRINT("VfatReadWritePartialCompletion() called\n");
 
   IrpContext = (PVFAT_IRP_CONTEXT)Context;
diff --git a/reactos/drivers/filesystems/fastfat/dirwr.c b/reactos/drivers/filesystems/fastfat/dirwr.c
index c2f3168c0f5..174c135987a 100644
--- a/reactos/drivers/filesystems/fastfat/dirwr.c
+++ b/reactos/drivers/filesystems/fastfat/dirwr.c
@@ -77,7 +77,7 @@ vfatFindDirSpace(
 {
     LARGE_INTEGER FileOffset;
     ULONG i, count, size, nbFree = 0;
-    PDIR_ENTRY pFatEntry;
+    PDIR_ENTRY pFatEntry = NULL;
     PVOID Context = NULL;
     NTSTATUS Status;
     ULONG SizeDirEntry;
@@ -616,7 +616,7 @@ FATDelEntry(
     ULONG CurrentCluster = 0, NextCluster, i;
     PVOID Context = NULL;
     LARGE_INTEGER Offset;
-    PFAT_DIR_ENTRY pDirEntry;
+    PFAT_DIR_ENTRY pDirEntry = NULL;
 
     ASSERT(pFcb);
     ASSERT(pFcb->parentFcb);
diff --git a/reactos/drivers/filesystems/fastfat/ea.c b/reactos/drivers/filesystems/fastfat/ea.c
index 5bf25f39d64..80a86dae234 100644
--- a/reactos/drivers/filesystems/fastfat/ea.c
+++ b/reactos/drivers/filesystems/fastfat/ea.c
@@ -36,5 +36,9 @@ VfatSetExtendedAttributes(PFILE_OBJECT FileObject,
 			  PVOID Ea,
 			  ULONG EaLength)
 {
+	UNREFERENCED_PARAMETER(FileObject);
+	UNREFERENCED_PARAMETER(Ea);
+	UNREFERENCED_PARAMETER(EaLength);
+
   return(STATUS_EAS_NOT_SUPPORTED);
 }
diff --git a/reactos/drivers/filesystems/fastfat/finfo.c b/reactos/drivers/filesystems/fastfat/finfo.c
index 75873f7405e..11618a5d8f6 100644
--- a/reactos/drivers/filesystems/fastfat/finfo.c
+++ b/reactos/drivers/filesystems/fastfat/finfo.c
@@ -120,6 +120,10 @@ VfatGetPositionInformation(PFILE_OBJECT FileObject,
 			   PFILE_POSITION_INFORMATION PositionInfo,
 			   PULONG BufferLength)
 {
+  UNREFERENCED_PARAMETER(FileObject);
+  UNREFERENCED_PARAMETER(FCB);
+  UNREFERENCED_PARAMETER(DeviceObject);
+
   DPRINT ("VfatGetPositionInformation()\n");
 
   if (*BufferLength < sizeof(FILE_POSITION_INFORMATION))
@@ -203,6 +207,9 @@ VfatGetBasicInformation(PFILE_OBJECT FileObject,
 			PULONG BufferLength)
 {
   PDEVICE_EXTENSION DeviceExt;
+  
+  UNREFERENCED_PARAMETER(FileObject);
+  
   DPRINT("VfatGetBasicInformation()\n");
 
   DeviceExt = (PDEVICE_EXTENSION)DeviceObject->DeviceExtension;
@@ -339,6 +346,10 @@ VfatGetNameInformation(PFILE_OBJECT FileObject,
  */
 {
   ULONG BytesToCopy;
+
+  UNREFERENCED_PARAMETER(FileObject);
+  UNREFERENCED_PARAMETER(DeviceObject);
+
   ASSERT(NameInfo != NULL);
   ASSERT(FCB != NULL);
 
@@ -470,6 +481,9 @@ VfatGetEaInformation(PFILE_OBJECT FileObject,
 {
     PDEVICE_EXTENSION DeviceExt = DeviceObject->DeviceExtension;
 
+    UNREFERENCED_PARAMETER(FileObject);
+    UNREFERENCED_PARAMETER(Fcb);
+
     /* FIXME - use SEH to access the buffer! */
     Info->EaSize = 0;
     *BufferLength -= sizeof(*Info);
diff --git a/reactos/drivers/filesystems/fastfat/vfat.h b/reactos/drivers/filesystems/fastfat/vfat.h
index b9f96af9363..0a5deb5a275 100644
--- a/reactos/drivers/filesystems/fastfat/vfat.h
+++ b/reactos/drivers/filesystems/fastfat/vfat.h
@@ -2,16 +2,9 @@
 #include <ntdddisk.h>
 #include <debug.h>
 
-#ifdef __GNUC__
 #include <ccros.h>
 
 #define USE_ROS_CC_AND_FS
-#else
-#define KEBUGCHECK KeBugCheck
-#define KEBUGCHECKEX KeBugCheckEx
-#define ROUND_DOWN(N, S) ((N) - ((N) % (S)))
-#define ROUND_UP(N, S) ROUND_DOWN((N) + (S) - 1, (S))
-#endif
 
 #define ROUND_DOWN(n, align) \
     (((ULONG)n) & ~((align) - 1l))