Index: reactos/drivers/filesystems/udfs/env_spec.cpp
===================================================================
--- reactos/drivers/filesystems/udfs/env_spec.cpp	(revision 71429)
+++ reactos/drivers/filesystems/udfs/env_spec.cpp	(working copy)
@@ -307,14 +307,14 @@
     KeQuerySystemTime((PLARGE_INTEGER)&IoEnterTime);
 #endif //MEASURE_IO_PERFORMANCE
 
-#if defined DBG || defined USE_PERF_PRINT
+#if defined UDF_DBG || defined USE_PERF_PRINT
     ULONG Lba = (ULONG)(Offset>>0xb);
 //    ASSERT(!(Lba & (32-1)));
     PerfPrint(("UDFPhWrite: Length: %x Lba: %lx\n",Length>>0xb,Lba));
 //    KdPrint(("UDFPhWrite: Length: %x Lba: %lx\n",Length>>0x9,Offset>>0x9));
-#endif //DBG
+#endif //UDF_DBG
 
-#ifdef DBG
+#ifdef UDF_DBG
     if(UDF_SIMULATE_WRITES) {
 /* FIXME ReactOS
    If this function is to force a read from the bufffer to simulate any segfaults, then it makes sense.
@@ -327,7 +327,7 @@
         *WrittenBytes = Length;
         return STATUS_SUCCESS;
     }
-#endif //DBG
+#endif //UDF_DBG
 
     ROffset.QuadPart = Offset;
     (*WrittenBytes) = 0;
Index: reactos/drivers/filesystems/udfs/udf_dbg.h
===================================================================
--- reactos/drivers/filesystems/udfs/udf_dbg.h	(revision 71429)
+++ reactos/drivers/filesystems/udfs/udf_dbg.h	(working copy)
@@ -39,6 +39,7 @@
 
 //#define UDF_SIMULATE_WRITES
 
+#ifdef UDF_DBG
 #define USE_PERF_PRINT
 
 #define USE_KD_PRINT
@@ -45,9 +46,10 @@
 #define USE_MM_PRINT
 #define USE_AD_PRINT
 #define UDF_DUMP_EXTENT
-//#define USE_TH_PRINT
-//#define USE_TIME_PRINT
-//#define CHECK_REF_COUNTS
+#define USE_TH_PRINT
+#define USE_TIME_PRINT
+#define CHECK_REF_COUNTS
+#endif
 
 //======================================
 
@@ -292,7 +294,7 @@
 
 #define KdDump(a,b) {}
 
-#endif // UDF_DBG
+#endif // UDF_DBG || PRINT_ALWAYS
 
 #define UserPrint  KdPrint
 
Index: reactos/drivers/filesystems/udfs/udf_info/extent.cpp
===================================================================
--- reactos/drivers/filesystems/udfs/udf_info/extent.cpp	(revision 71429)
+++ reactos/drivers/filesystems/udfs/udf_info/extent.cpp	(working copy)
@@ -1860,7 +1860,9 @@
             UDFPackMapping(Vcb, ExtInfo);
         }
         AdPrint(("Alloc->Rec (1) new %x\n", ExtInfo->Mapping));
+#ifdef UDF_DBG
         ASSERT(check_size == UDFGetExtentLength(ExtInfo->Mapping));
+#endif //UDF_DBG
         AdPrint(("Alloc->Rec: ExtInfo %x, Extent %x\n", ExtInfo, ExtInfo->Mapping));
         return STATUS_SUCCESS;
     }
@@ -1928,8 +1930,10 @@
     ExtInfo->Mapping = NewExtent;
     if(TryPack)
         UDFPackMapping(Vcb, ExtInfo);
+#ifdef UDF_DBG
     ASSERT(check_size == UDFGetExtentLength(ExtInfo->Mapping));
     ASSERT(!(check_size & (LBS-1)));
+#endif //UDF_DBG
 
     AdPrint(("Alloc->Rec: ExtInfo %x, Extent %x\n", ExtInfo, ExtInfo->Mapping));
 
@@ -2828,8 +2832,10 @@
     NewMap[j].extLength =
     NewMap[j].extLocation = 0;
 
+#ifdef UDF_DBG
     ASSERT(check_size == UDFGetExtentLength(ExtInfo->Mapping));
     ASSERT(check_size == UDFGetExtentLength(NewMap));
+#endif //UDF_DBG
 
     AdPrint(("Pack ExtInfo %x, NewMap %x, OldMap %x\n", ExtInfo, NewMap, OldMap));
     
Index: reactos/drivers/filesystems/udfs/udf_info/mount.cpp
===================================================================
--- reactos/drivers/filesystems/udfs/udf_info/mount.cpp	(revision 71429)
+++ reactos/drivers/filesystems/udfs/udf_info/mount.cpp	(working copy)
@@ -2333,12 +2333,14 @@
     int8*     Buf
     )
 {
+#ifdef UDF_DBG
     ImpUseVolDesc* iuvd = (ImpUseVolDesc*)Buf;
-    ImpUseVolDescImpUse* iuvdiu = (ImpUseVolDescImpUse*)&(iuvd->impUse);
+    //ImpUseVolDescImpUse* iuvdiu = (ImpUseVolDescImpUse*)&(iuvd->impUse);
     KdPrint(("UDF: Imp Use Vol Desc:\n"));
     KdPrint((" volDescSeqNum = %x\n", iuvd->volDescSeqNum));
     KdPrint(("UDF: Imp Use Vol Desc Imp Use:\n"));
     KdDump(iuvdiu, sizeof(ImpUseVolDescImpUse));
+#endif
     return STATUS_SUCCESS;
 } // UDFLoadImpUseVolDesc()
 
Index: reactos/drivers/filesystems/udfs/udf_info/udf_info.cpp
===================================================================
--- reactos/drivers/filesystems/udfs/udf_info/udf_info.cpp	(revision 71429)
+++ reactos/drivers/filesystems/udfs/udf_info/udf_info.cpp	(working copy)
@@ -2419,7 +2419,9 @@
 
         if(!KeepDloc) {
 
+#ifdef UDF_DBG
             ASSERT(!Modified);
+#endif // UDF_DBG
 
 #ifndef UDF_TRACK_ONDISK_ALLOCATION
             if(Dloc->DataLoc.Mapping)  MyFreePool__(Dloc->DataLoc.Mapping);
Index: reactos/drivers/filesystems/udfs/udffs.h
===================================================================
--- reactos/drivers/filesystems/udfs/udffs.h	(revision 71429)
+++ reactos/drivers/filesystems/udfs/udffs.h	(working copy)
@@ -120,9 +120,9 @@
 
 #define PEXTENDED_IO_STACK_LOCATION  PIO_STACK_LOCATION
 
-#ifndef NDEBUG
+/*#ifndef NDEBUG
 #define UDF_DBG
-#endif
+#endif*/
 
 #define VALIDATE_STRUCTURES
 // the following include files should be in the inc sub-dir associated with this driver
Index: reactos/drivers/filesystems/udfs/volinfo.cpp
===================================================================
--- reactos/drivers/filesystems/udfs/volinfo.cpp	(revision 71429)
+++ reactos/drivers/filesystems/udfs/volinfo.cpp	(working copy)
@@ -462,7 +462,9 @@
 
     KdPrint(("  UDFQueryFsDeviceInfo: \n"));
     //  Update the output buffer.
+#ifdef UDF_DBG
     ASSERT(! (Vcb->TargetDeviceObject->Characteristics & (FILE_READ_ONLY_DEVICE | FILE_WRITE_ONCE_MEDIA)));
+#endif
     Buffer->Characteristics = Vcb->TargetDeviceObject->Characteristics & ~(FILE_READ_ONLY_DEVICE | FILE_WRITE_ONCE_MEDIA);
     Buffer->DeviceType = Vcb->TargetDeviceObject->DeviceType;
     KdPrint(("    Characteristics %x, DeviceType %x\n", Buffer->Characteristics, Buffer->DeviceType));