diff --git a/reactos/ChangeLog b/reactos/ChangeLog
index bebd651d10a..d15f0b341b9 100644
--- a/reactos/ChangeLog
+++ b/reactos/ChangeLog
@@ -1,3 +1,7 @@
+2003-07-24  Casper S. Hornstrup  <chorns@users.sourceforge.net>
+
+	* drivers/fs/vfat/*.c: Remove protection of NDEBUG.
+
 2003-07-24  Casper S. Hornstrup  <chorns@users.sourceforge.net>
 
 	Move welcome from rosapps to here and beautify it a bit.
diff --git a/reactos/drivers/fs/vfat/blockdev.c b/reactos/drivers/fs/vfat/blockdev.c
index 937bb347303..02b731f9db3 100644
--- a/reactos/drivers/fs/vfat/blockdev.c
+++ b/reactos/drivers/fs/vfat/blockdev.c
@@ -11,9 +11,7 @@
 
 #include <ddk/ntddk.h>
 
-#ifndef NDEBUG
 #define NDEBUG
-#endif
 #include <debug.h>
 
 #include "vfat.h"
diff --git a/reactos/drivers/fs/vfat/cleanup.c b/reactos/drivers/fs/vfat/cleanup.c
index 93104e2fbb7..9e75f489814 100644
--- a/reactos/drivers/fs/vfat/cleanup.c
+++ b/reactos/drivers/fs/vfat/cleanup.c
@@ -1,4 +1,4 @@
-/* $Id: cleanup.c,v 1.12 2003/07/24 19:00:42 chorns Exp $
+/* $Id: cleanup.c,v 1.13 2003/07/24 20:52:58 chorns Exp $
  *
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
@@ -11,9 +11,7 @@
 
 #include <ddk/ntddk.h>
 
-#ifndef NDEBUG
 #define NDEBUG
-#endif
 #include <debug.h>
 
 #include "vfat.h"
diff --git a/reactos/drivers/fs/vfat/close.c b/reactos/drivers/fs/vfat/close.c
index 668107e0f84..bdedc50a045 100644
--- a/reactos/drivers/fs/vfat/close.c
+++ b/reactos/drivers/fs/vfat/close.c
@@ -1,4 +1,4 @@
-/* $Id: close.c,v 1.19 2003/07/24 19:00:42 chorns Exp $
+/* $Id: close.c,v 1.20 2003/07/24 20:52:58 chorns Exp $
  *
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
@@ -11,9 +11,7 @@
 
 #include <ddk/ntddk.h>
 
-#ifndef NDEBUG
 #define NDEBUG
-#endif
 #include <debug.h>
 
 #include "vfat.h"
diff --git a/reactos/drivers/fs/vfat/create.c b/reactos/drivers/fs/vfat/create.c
index 1a3ee3a2ed9..f6b2837b263 100644
--- a/reactos/drivers/fs/vfat/create.c
+++ b/reactos/drivers/fs/vfat/create.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: create.c,v 1.62 2003/07/24 19:00:42 chorns Exp $
+/* $Id: create.c,v 1.63 2003/07/24 20:52:58 chorns Exp $
  *
  * PROJECT:          ReactOS kernel
  * FILE:             services/fs/vfat/create.c
@@ -31,9 +31,7 @@
 #include <wchar.h>
 #include <limits.h>
 
-#ifndef NDEBUG
 #define NDEBUG
-#endif
 #include <debug.h>
 
 #include "vfat.h"
diff --git a/reactos/drivers/fs/vfat/dir.c b/reactos/drivers/fs/vfat/dir.c
index 3f6baf34823..1373155ba83 100644
--- a/reactos/drivers/fs/vfat/dir.c
+++ b/reactos/drivers/fs/vfat/dir.c
@@ -1,5 +1,5 @@
 /*
- * $Id: dir.c,v 1.29 2003/07/24 19:00:42 chorns Exp $
+ * $Id: dir.c,v 1.30 2003/07/24 20:52:58 chorns Exp $
  *
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
@@ -13,9 +13,7 @@
 #include <ddk/ntddk.h>
 #include <wchar.h>
 
-#ifndef NDEBUG
 #define NDEBUG
-#endif
 #include <debug.h>
 
 #include "vfat.h"
diff --git a/reactos/drivers/fs/vfat/direntry.c b/reactos/drivers/fs/vfat/direntry.c
index cd1d050c49a..db1791b1bfc 100644
--- a/reactos/drivers/fs/vfat/direntry.c
+++ b/reactos/drivers/fs/vfat/direntry.c
@@ -1,4 +1,4 @@
-/* $Id: direntry.c,v 1.13 2003/07/24 19:00:42 chorns Exp $
+/* $Id: direntry.c,v 1.14 2003/07/24 20:52:58 chorns Exp $
  *
  *
  * FILE:             DirEntry.c
@@ -15,9 +15,7 @@
 #include <wchar.h>
 #include <limits.h>
 
-#ifndef NDEBUG
 #define NDEBUG
-#endif
 #include <debug.h>
 
 #include "vfat.h"
diff --git a/reactos/drivers/fs/vfat/dirwr.c b/reactos/drivers/fs/vfat/dirwr.c
index 63e6292e36f..5d2d8fbbd47 100644
--- a/reactos/drivers/fs/vfat/dirwr.c
+++ b/reactos/drivers/fs/vfat/dirwr.c
@@ -1,4 +1,4 @@
-/* $Id: dirwr.c,v 1.37 2003/07/24 19:00:42 chorns Exp $
+/* $Id: dirwr.c,v 1.38 2003/07/24 20:52:58 chorns Exp $
  *
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
@@ -14,9 +14,7 @@
 #include <wchar.h>
 #include <string.h>
 
-#ifndef NDEBUG
 #define NDEBUG
-#endif
 #include <debug.h>
 
 #include "vfat.h"
diff --git a/reactos/drivers/fs/vfat/ea.c b/reactos/drivers/fs/vfat/ea.c
index 913721e71de..d5fd82c34a1 100644
--- a/reactos/drivers/fs/vfat/ea.c
+++ b/reactos/drivers/fs/vfat/ea.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: ea.c,v 1.2 2003/07/24 19:00:42 chorns Exp $
+/* $Id: ea.c,v 1.3 2003/07/24 20:52:58 chorns Exp $
  *
  * PROJECT:          ReactOS kernel
  * FILE:             services/fs/vfat/ea.c
@@ -31,9 +31,7 @@
 #include <wchar.h>
 #include <limits.h>
 
-#ifndef NDEBUG
 #define NDEBUG
-#endif
 #include <debug.h>
 
 #include "vfat.h"
diff --git a/reactos/drivers/fs/vfat/fat.c b/reactos/drivers/fs/vfat/fat.c
index 0e0ff0be87b..4d7e8f84fef 100644
--- a/reactos/drivers/fs/vfat/fat.c
+++ b/reactos/drivers/fs/vfat/fat.c
@@ -1,5 +1,5 @@
 /*
- * $Id: fat.c,v 1.42 2003/07/24 19:00:42 chorns Exp $
+ * $Id: fat.c,v 1.43 2003/07/24 20:52:58 chorns Exp $
  *
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
@@ -15,9 +15,7 @@
 #include <wchar.h>
 #include <ntos/minmax.h>
 
-#ifndef NDEBUG
 #define NDEBUG
-#endif
 #include <debug.h>
 
 #include "vfat.h"
diff --git a/reactos/drivers/fs/vfat/fcb.c b/reactos/drivers/fs/vfat/fcb.c
index 93281d632b0..ab92c371e83 100644
--- a/reactos/drivers/fs/vfat/fcb.c
+++ b/reactos/drivers/fs/vfat/fcb.c
@@ -1,4 +1,4 @@
-/* $Id: fcb.c,v 1.31 2003/07/24 19:00:42 chorns Exp $
+/* $Id: fcb.c,v 1.32 2003/07/24 20:52:58 chorns Exp $
  *
  *
  * FILE:             fcb.c
@@ -15,9 +15,7 @@
 #include <wchar.h>
 #include <limits.h>
 
-#ifndef NDEBUG
 #define NDEBUG
-#endif
 #include <debug.h>
 
 #include "vfat.h"
diff --git a/reactos/drivers/fs/vfat/finfo.c b/reactos/drivers/fs/vfat/finfo.c
index debad6106fc..078f49d0241 100644
--- a/reactos/drivers/fs/vfat/finfo.c
+++ b/reactos/drivers/fs/vfat/finfo.c
@@ -1,4 +1,4 @@
-/* $Id: finfo.c,v 1.31 2003/07/24 19:00:42 chorns Exp $
+/* $Id: finfo.c,v 1.32 2003/07/24 20:52:58 chorns Exp $
  *
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
@@ -13,9 +13,7 @@
 #include <ddk/ntddk.h>
 #include <wchar.h>
 
-#ifndef NDEBUG
 #define NDEBUG
-#endif
 #include <debug.h>
 
 #include "vfat.h"
diff --git a/reactos/drivers/fs/vfat/flush.c b/reactos/drivers/fs/vfat/flush.c
index 3830ef4c66b..05cc3848e46 100644
--- a/reactos/drivers/fs/vfat/flush.c
+++ b/reactos/drivers/fs/vfat/flush.c
@@ -1,4 +1,4 @@
-/* $Id: flush.c,v 1.3 2003/07/24 19:00:42 chorns Exp $
+/* $Id: flush.c,v 1.4 2003/07/24 20:52:58 chorns Exp $
  *
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
@@ -12,9 +12,7 @@
 #include <ddk/ntddk.h>
 #include "vfat.h"
 
-#ifndef NDEBUG
 #define NDEBUG
-#endif
 #include <debug.h>
 
 /* FUNCTIONS ****************************************************************/
diff --git a/reactos/drivers/fs/vfat/fsctl.c b/reactos/drivers/fs/vfat/fsctl.c
index 6af1bdcaa04..d7857cce527 100644
--- a/reactos/drivers/fs/vfat/fsctl.c
+++ b/reactos/drivers/fs/vfat/fsctl.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: fsctl.c,v 1.19 2003/07/24 19:00:42 chorns Exp $
+/* $Id: fsctl.c,v 1.20 2003/07/24 20:52:58 chorns Exp $
  *
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
@@ -29,9 +29,7 @@
 #include <ddk/ntddk.h>
 #include <wchar.h>
 
-#ifndef NDEBUG
 #define NDEBUG
-#endif
 #include <debug.h>
 
 #include "vfat.h"
diff --git a/reactos/drivers/fs/vfat/iface.c b/reactos/drivers/fs/vfat/iface.c
index 005ae57a6a0..6a5ca71f64a 100644
--- a/reactos/drivers/fs/vfat/iface.c
+++ b/reactos/drivers/fs/vfat/iface.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: iface.c,v 1.69 2003/07/24 19:00:42 chorns Exp $
+/* $Id: iface.c,v 1.70 2003/07/24 20:52:58 chorns Exp $
  *
  * PROJECT:          ReactOS kernel
  * FILE:             services/fs/vfat/iface.c
@@ -28,9 +28,7 @@
 
 #include <ddk/ntddk.h>
 
-#ifndef NDEBUG
 #define NDEBUG
-#endif
 #include <debug.h>
 
 #include "vfat.h"
diff --git a/reactos/drivers/fs/vfat/misc.c b/reactos/drivers/fs/vfat/misc.c
index b13f2414f46..dcf68fcd479 100644
--- a/reactos/drivers/fs/vfat/misc.c
+++ b/reactos/drivers/fs/vfat/misc.c
@@ -1,4 +1,4 @@
-/* $Id: misc.c,v 1.9 2003/07/24 19:00:42 chorns Exp $
+/* $Id: misc.c,v 1.10 2003/07/24 20:52:58 chorns Exp $
  *
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
@@ -13,9 +13,7 @@
 #include <ddk/ntddk.h>
 #include <wchar.h>
 
-#ifndef NDEBUG
 #define NDEBUG
-#endif
 #include <debug.h>
 
 #include "vfat.h"
diff --git a/reactos/drivers/fs/vfat/rw.c b/reactos/drivers/fs/vfat/rw.c
index 6b491c52071..77157b23d34 100644
--- a/reactos/drivers/fs/vfat/rw.c
+++ b/reactos/drivers/fs/vfat/rw.c
@@ -1,5 +1,5 @@
 
-/* $Id: rw.c,v 1.58 2003/07/24 19:00:42 chorns Exp $
+/* $Id: rw.c,v 1.59 2003/07/24 20:52:58 chorns Exp $
  *
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
@@ -15,9 +15,7 @@
 #include <wchar.h>
 #include <ntos/minmax.h>
 
-#ifndef NDEBUG
 #define NDEBUG
-#endif
 #include <debug.h>
 
 #include "vfat.h"
diff --git a/reactos/drivers/fs/vfat/shutdown.c b/reactos/drivers/fs/vfat/shutdown.c
index 9a041dabf02..e9e6159ede1 100644
--- a/reactos/drivers/fs/vfat/shutdown.c
+++ b/reactos/drivers/fs/vfat/shutdown.c
@@ -1,4 +1,4 @@
-/* $Id: shutdown.c,v 1.6 2003/07/24 19:00:42 chorns Exp $
+/* $Id: shutdown.c,v 1.7 2003/07/24 20:52:58 chorns Exp $
  *
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
@@ -11,9 +11,7 @@
 
 #include <ddk/ntddk.h>
 
-#ifndef NDEBUG
 #define NDEBUG
-#endif
 #include <debug.h>
 
 #include "vfat.h"
diff --git a/reactos/drivers/fs/vfat/string.c b/reactos/drivers/fs/vfat/string.c
index 0d9f9a5b4d4..aa398c4b319 100644
--- a/reactos/drivers/fs/vfat/string.c
+++ b/reactos/drivers/fs/vfat/string.c
@@ -1,4 +1,4 @@
-/* $Id: string.c,v 1.10 2003/07/24 19:00:42 chorns Exp $
+/* $Id: string.c,v 1.11 2003/07/24 20:52:58 chorns Exp $
  *
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
@@ -13,9 +13,7 @@
 #include <ddk/ntddk.h>
 #include <wchar.h>
 
-#ifndef NDEBUG
 #define NDEBUG
-#endif
 #include <debug.h>
 
 #include "vfat.h"
diff --git a/reactos/drivers/fs/vfat/volume.c b/reactos/drivers/fs/vfat/volume.c
index c97e63c036a..b5c2d9a9d61 100644
--- a/reactos/drivers/fs/vfat/volume.c
+++ b/reactos/drivers/fs/vfat/volume.c
@@ -1,4 +1,4 @@
-/* $Id: volume.c,v 1.21 2003/07/24 19:00:42 chorns Exp $
+/* $Id: volume.c,v 1.22 2003/07/24 20:52:58 chorns Exp $
  *
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
@@ -12,9 +12,7 @@
 #include <ddk/ntddk.h>
 #include <wchar.h>
 
-#ifndef NDEBUG
 #define NDEBUG
-#endif
 #include <debug.h>
 
 #include "vfat.h"