From f69a3b2930b81c51a55effa95a29a64d77014302 Mon Sep 17 00:00:00 2001
From: Amine Khaldi <amine.khaldi@reactos.org>
Date: Thu, 19 Dec 2013 16:20:28 +0000
Subject: [PATCH] [FASTFAT] * Do not include debug.h into the main header.

svn path=/trunk/; revision=61295
---
 reactos/drivers/filesystems/fastfat/blockdev.c | 4 +++-
 reactos/drivers/filesystems/fastfat/cleanup.c  | 4 +++-
 reactos/drivers/filesystems/fastfat/close.c    | 4 +++-
 reactos/drivers/filesystems/fastfat/create.c   | 4 +++-
 reactos/drivers/filesystems/fastfat/dir.c      | 4 +++-
 reactos/drivers/filesystems/fastfat/direntry.c | 4 +++-
 reactos/drivers/filesystems/fastfat/dirwr.c    | 4 +++-
 reactos/drivers/filesystems/fastfat/ea.c       | 4 +++-
 reactos/drivers/filesystems/fastfat/fastio.c   | 4 +++-
 reactos/drivers/filesystems/fastfat/fat.c      | 4 +++-
 reactos/drivers/filesystems/fastfat/fcb.c      | 8 +++++---
 reactos/drivers/filesystems/fastfat/finfo.c    | 4 +++-
 reactos/drivers/filesystems/fastfat/flush.c    | 4 +++-
 reactos/drivers/filesystems/fastfat/fsctl.c    | 4 +++-
 reactos/drivers/filesystems/fastfat/iface.c    | 4 +++-
 reactos/drivers/filesystems/fastfat/misc.c     | 4 +++-
 reactos/drivers/filesystems/fastfat/pnp.c      | 4 +++-
 reactos/drivers/filesystems/fastfat/rw.c       | 4 +++-
 reactos/drivers/filesystems/fastfat/shutdown.c | 4 +++-
 reactos/drivers/filesystems/fastfat/string.c   | 4 +++-
 reactos/drivers/filesystems/fastfat/vfat.h     | 1 -
 reactos/drivers/filesystems/fastfat/volume.c   | 4 +++-
 22 files changed, 65 insertions(+), 24 deletions(-)

diff --git a/reactos/drivers/filesystems/fastfat/blockdev.c b/reactos/drivers/filesystems/fastfat/blockdev.c
index 796834c9dd0..419390fc4ef 100644
--- a/reactos/drivers/filesystems/fastfat/blockdev.c
+++ b/reactos/drivers/filesystems/fastfat/blockdev.c
@@ -9,9 +9,11 @@
 
 /* INCLUDES *****************************************************************/
 
-#define NDEBUG
 #include "vfat.h"
 
+#define NDEBUG
+#include <debug.h>
+
 /* FUNCTIONS ***************************************************************/
 
 static IO_COMPLETION_ROUTINE VfatReadWritePartialCompletion;
diff --git a/reactos/drivers/filesystems/fastfat/cleanup.c b/reactos/drivers/filesystems/fastfat/cleanup.c
index 97db29d648b..4887f9dfe4f 100644
--- a/reactos/drivers/filesystems/fastfat/cleanup.c
+++ b/reactos/drivers/filesystems/fastfat/cleanup.c
@@ -8,9 +8,11 @@
 
 /* INCLUDES *****************************************************************/
 
-#define NDEBUG
 #include "vfat.h"
 
+#define NDEBUG
+#include <debug.h>
+
 /* FUNCTIONS ****************************************************************/
 
 /*
diff --git a/reactos/drivers/filesystems/fastfat/close.c b/reactos/drivers/filesystems/fastfat/close.c
index 5776dd0e484..78f016f7d6e 100644
--- a/reactos/drivers/filesystems/fastfat/close.c
+++ b/reactos/drivers/filesystems/fastfat/close.c
@@ -8,9 +8,11 @@
 
 /* INCLUDES *****************************************************************/
 
-#define NDEBUG
 #include "vfat.h"
 
+#define NDEBUG
+#include <debug.h>
+
 /* FUNCTIONS ****************************************************************/
 
 /*
diff --git a/reactos/drivers/filesystems/fastfat/create.c b/reactos/drivers/filesystems/fastfat/create.c
index e3d026c5478..fbd5231c9a5 100644
--- a/reactos/drivers/filesystems/fastfat/create.c
+++ b/reactos/drivers/filesystems/fastfat/create.c
@@ -25,9 +25,11 @@
 
 /* INCLUDES *****************************************************************/
 
-#define NDEBUG
 #include "vfat.h"
 
+#define NDEBUG
+#include <debug.h>
+
 /* FUNCTIONS *****************************************************************/
 
 VOID
diff --git a/reactos/drivers/filesystems/fastfat/dir.c b/reactos/drivers/filesystems/fastfat/dir.c
index 0f218ec5227..2b5d8f1da52 100644
--- a/reactos/drivers/filesystems/fastfat/dir.c
+++ b/reactos/drivers/filesystems/fastfat/dir.c
@@ -10,9 +10,11 @@
 
 /* INCLUDES *****************************************************************/
 
-#define NDEBUG
 #include "vfat.h"
 
+#define NDEBUG
+#include <debug.h>
+
 /* FUNCTIONS ****************************************************************/
 
 /* Function like DosDateTimeToFileTime */
diff --git a/reactos/drivers/filesystems/fastfat/direntry.c b/reactos/drivers/filesystems/fastfat/direntry.c
index 5d85b0d9dec..336f014ad5f 100644
--- a/reactos/drivers/filesystems/fastfat/direntry.c
+++ b/reactos/drivers/filesystems/fastfat/direntry.c
@@ -10,9 +10,11 @@
 
 /*  -------------------------------------------------------  INCLUDES  */
 
-#define NDEBUG
 #include "vfat.h"
 
+#define NDEBUG
+#include <debug.h>
+
 ULONG
 vfatDirEntryGetFirstCluster(
     PDEVICE_EXTENSION pDeviceExt,
diff --git a/reactos/drivers/filesystems/fastfat/dirwr.c b/reactos/drivers/filesystems/fastfat/dirwr.c
index 7e5a91bec42..1444665fcbb 100644
--- a/reactos/drivers/filesystems/fastfat/dirwr.c
+++ b/reactos/drivers/filesystems/fastfat/dirwr.c
@@ -8,9 +8,11 @@
 
 /* INCLUDES *****************************************************************/
 
-#define NDEBUG
 #include "vfat.h"
 
+#define NDEBUG
+#include <debug.h>
+
 /*
  * update an existing FAT entry
  */
diff --git a/reactos/drivers/filesystems/fastfat/ea.c b/reactos/drivers/filesystems/fastfat/ea.c
index 7a5a1b28d09..d2b92a49a6a 100644
--- a/reactos/drivers/filesystems/fastfat/ea.c
+++ b/reactos/drivers/filesystems/fastfat/ea.c
@@ -25,9 +25,11 @@
 
 /* INCLUDES *****************************************************************/
 
-#define NDEBUG
 #include "vfat.h"
 
+#define NDEBUG
+#include <debug.h>
+
 /* FUNCTIONS *****************************************************************/
 
 NTSTATUS
diff --git a/reactos/drivers/filesystems/fastfat/fastio.c b/reactos/drivers/filesystems/fastfat/fastio.c
index b2d394634d7..4a6e148ed04 100644
--- a/reactos/drivers/filesystems/fastfat/fastio.c
+++ b/reactos/drivers/filesystems/fastfat/fastio.c
@@ -6,9 +6,11 @@
  * PROGRAMMER:       Herve Poussineau (hpoussin@reactos.org)
  */
 
-#define NDEBUG
 #include "vfat.h"
 
+#define NDEBUG
+#include <debug.h>
+
 static FAST_IO_CHECK_IF_POSSIBLE VfatFastIoCheckIfPossible;
 
 static
diff --git a/reactos/drivers/filesystems/fastfat/fat.c b/reactos/drivers/filesystems/fastfat/fat.c
index 112df045935..a079f25913a 100644
--- a/reactos/drivers/filesystems/fastfat/fat.c
+++ b/reactos/drivers/filesystems/fastfat/fat.c
@@ -9,9 +9,11 @@
 
 /* INCLUDES *****************************************************************/
 
-#define NDEBUG
 #include "vfat.h"
 
+#define NDEBUG
+#include <debug.h>
+
 /* GLOBALS ******************************************************************/
 
 #define  CACHEPAGESIZE(pDeviceExt) ((pDeviceExt)->FatInfo.BytesPerCluster > PAGE_SIZE ? \
diff --git a/reactos/drivers/filesystems/fastfat/fcb.c b/reactos/drivers/filesystems/fastfat/fcb.c
index 7c8e0e6f00d..55bb609366a 100644
--- a/reactos/drivers/filesystems/fastfat/fcb.c
+++ b/reactos/drivers/filesystems/fastfat/fcb.c
@@ -10,13 +10,15 @@
 
 /*  -------------------------------------------------------  INCLUDES  */
 
+#include "vfat.h"
+
+#define NDEBUG
+#include <debug.h>
+
 #ifdef __GNUC__
 #include <wctype.h> /* towlower prototype */
 #endif
 
-#define NDEBUG
-#include "vfat.h"
-
 /*  --------------------------------------------------------  DEFINES  */
 
 #define TAG_FCB 'BCFV'
diff --git a/reactos/drivers/filesystems/fastfat/finfo.c b/reactos/drivers/filesystems/fastfat/finfo.c
index 1a7a53a4f87..d0db17852b5 100644
--- a/reactos/drivers/filesystems/fastfat/finfo.c
+++ b/reactos/drivers/filesystems/fastfat/finfo.c
@@ -10,9 +10,11 @@
 
 /* INCLUDES *****************************************************************/
 
-#define NDEBUG
 #include "vfat.h"
 
+#define NDEBUG
+#include <debug.h>
+
 /* GLOBALS ******************************************************************/
 
 const char* FileInformationClassNames[] =
diff --git a/reactos/drivers/filesystems/fastfat/flush.c b/reactos/drivers/filesystems/fastfat/flush.c
index 97ed3b09e47..96d6353605a 100644
--- a/reactos/drivers/filesystems/fastfat/flush.c
+++ b/reactos/drivers/filesystems/fastfat/flush.c
@@ -8,9 +8,11 @@
 
 /* INCLUDES *****************************************************************/
 
-#define NDEBUG
 #include "vfat.h"
 
+#define NDEBUG
+#include <debug.h>
+
 /* FUNCTIONS ****************************************************************/
 
 static
diff --git a/reactos/drivers/filesystems/fastfat/fsctl.c b/reactos/drivers/filesystems/fastfat/fsctl.c
index efc4bec2572..24feadd906e 100644
--- a/reactos/drivers/filesystems/fastfat/fsctl.c
+++ b/reactos/drivers/filesystems/fastfat/fsctl.c
@@ -25,9 +25,11 @@
 
 /* INCLUDES *****************************************************************/
 
-#define NDEBUG
 #include "vfat.h"
 
+#define NDEBUG
+#include <debug.h>
+
 /* FUNCTIONS ****************************************************************/
 
 #define  CACHEPAGESIZE(pDeviceExt) ((pDeviceExt)->FatInfo.BytesPerCluster > PAGE_SIZE ? \
diff --git a/reactos/drivers/filesystems/fastfat/iface.c b/reactos/drivers/filesystems/fastfat/iface.c
index f9ed3a6728d..03ddfe887fd 100644
--- a/reactos/drivers/filesystems/fastfat/iface.c
+++ b/reactos/drivers/filesystems/fastfat/iface.c
@@ -25,9 +25,11 @@
 
 /* INCLUDES *****************************************************************/
 
-#define NDEBUG
 #include "vfat.h"
 
+#define NDEBUG
+#include <debug.h>
+
 /* GLOBALS *****************************************************************/
 
 PVFAT_GLOBAL_DATA VfatGlobalData;
diff --git a/reactos/drivers/filesystems/fastfat/misc.c b/reactos/drivers/filesystems/fastfat/misc.c
index 0d678f85e79..53edd8b5026 100644
--- a/reactos/drivers/filesystems/fastfat/misc.c
+++ b/reactos/drivers/filesystems/fastfat/misc.c
@@ -9,9 +9,11 @@
 
 /* INCLUDES *****************************************************************/
 
-#define NDEBUG
 #include "vfat.h"
 
+#define NDEBUG
+#include <debug.h>
+
 /* GLOBALS ******************************************************************/
 
 const char* MajorFunctionNames[] =
diff --git a/reactos/drivers/filesystems/fastfat/pnp.c b/reactos/drivers/filesystems/fastfat/pnp.c
index 29802389322..255350dd17d 100644
--- a/reactos/drivers/filesystems/fastfat/pnp.c
+++ b/reactos/drivers/filesystems/fastfat/pnp.c
@@ -9,9 +9,11 @@
 
 /* INCLUDES *****************************************************************/
 
-#define NDEBUG
 #include "vfat.h"
 
+#define NDEBUG
+#include <debug.h>
+
 /* FUNCTIONS ****************************************************************/
 
 NTSTATUS
diff --git a/reactos/drivers/filesystems/fastfat/rw.c b/reactos/drivers/filesystems/fastfat/rw.c
index 43bcaddd7d3..1477dd7d024 100644
--- a/reactos/drivers/filesystems/fastfat/rw.c
+++ b/reactos/drivers/filesystems/fastfat/rw.c
@@ -9,9 +9,11 @@
 
 /* INCLUDES *****************************************************************/
 
-#define NDEBUG
 #include "vfat.h"
 
+#define NDEBUG
+#include <debug.h>
+
 /*
  * Uncomment to enable strict verification of cluster/offset pair
  * caching. If this option is enabled you lose all the benefits of
diff --git a/reactos/drivers/filesystems/fastfat/shutdown.c b/reactos/drivers/filesystems/fastfat/shutdown.c
index 3bd5698fbaf..e2e6be542e9 100644
--- a/reactos/drivers/filesystems/fastfat/shutdown.c
+++ b/reactos/drivers/filesystems/fastfat/shutdown.c
@@ -8,9 +8,11 @@
 
 /* INCLUDES *****************************************************************/
 
-#define NDEBUG
 #include "vfat.h"
 
+#define NDEBUG
+#include <debug.h>
+
 /* FUNCTIONS ****************************************************************/
 
 static
diff --git a/reactos/drivers/filesystems/fastfat/string.c b/reactos/drivers/filesystems/fastfat/string.c
index 7e05d001a2c..6a8f65a48f5 100644
--- a/reactos/drivers/filesystems/fastfat/string.c
+++ b/reactos/drivers/filesystems/fastfat/string.c
@@ -9,9 +9,11 @@
 
 /* INCLUDES *****************************************************************/
 
-#define NDEBUG
 #include "vfat.h"
 
+#define NDEBUG
+#include <debug.h>
+
 /* FUNCTIONS ****************************************************************/
 
 const WCHAR *long_illegals = L"\"*\\<>/?:|";
diff --git a/reactos/drivers/filesystems/fastfat/vfat.h b/reactos/drivers/filesystems/fastfat/vfat.h
index 33b225f570c..f627ff65638 100644
--- a/reactos/drivers/filesystems/fastfat/vfat.h
+++ b/reactos/drivers/filesystems/fastfat/vfat.h
@@ -1,7 +1,6 @@
 #include <ntifs.h>
 #include <bugcodes.h>
 #include <ntdddisk.h>
-#include <debug.h>
 #include <dos.h>
 
 #define USE_ROS_CC_AND_FS
diff --git a/reactos/drivers/filesystems/fastfat/volume.c b/reactos/drivers/filesystems/fastfat/volume.c
index c72fc3f575e..55f3d546707 100644
--- a/reactos/drivers/filesystems/fastfat/volume.c
+++ b/reactos/drivers/filesystems/fastfat/volume.c
@@ -9,9 +9,11 @@
 
 /* INCLUDES *****************************************************************/
 
-#define NDEBUG
 #include "vfat.h"
 
+#define NDEBUG
+#include <debug.h>
+
 /* FUNCTIONS ****************************************************************/
 
 static
-- 
2.17.1