diff --git a/VBA.vcproj b/VBA.vcproj
index 3d34c8d9..2eb83b89 100644
--- a/VBA.vcproj
+++ b/VBA.vcproj
@@ -56,7 +56,7 @@
 				AdditionalOptions="/MP"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\dependencies\zlib;..\dependencies\libpng;"..\dependencies\File_Extractor-0.4.2\fex";..\dependencies\cximage;..\dependencies\msvc"
-				PreprocessorDefinitions="WIN32;_WINDOWS;_DEBUG;DEV_VERSION;BKPT_SUPPORT;MMX;_CRT_SECURE_NO_WARNINGS"
+				PreprocessorDefinitions="WIN32;_WINDOWS;_DEBUG;_CRT_SECURE_NO_WARNINGS;MMX;BKPT_SUPPORT;GBA_LOGGING"
 				StringPooling="false"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -165,7 +165,7 @@
 				AdditionalOptions="/MP"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\dependencies\zlib;..\dependencies\libpng;"..\dependencies\File_Extractor-0.4.2\fex";..\dependencies\cximage;..\dependencies\msvc"
-				PreprocessorDefinitions="WIN32;_WINDOWS;_DEBUG;DEV_VERSION;BKPT_SUPPORT;_CRT_SECURE_NO_WARNINGS;HAS_FILE_EXTRACTOR;C_CORE"
+				PreprocessorDefinitions="WIN32;_WINDOWS;_DEBUG;_CRT_SECURE_NO_WARNINGS;BKPT_SUPPORT;GBA_LOGGING;C_CORE"
 				StringPooling="false"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -279,7 +279,7 @@
 				FavorSizeOrSpeed="1"
 				WholeProgramOptimization="true"
 				AdditionalIncludeDirectories="..\dependencies\zlib;..\dependencies\libpng;"..\dependencies\File_Extractor-0.4.2\fex";..\dependencies\cximage;..\dependencies\msvc"
-				PreprocessorDefinitions="WIN32;WINVER=0x0500;NDEBUG;_WINDOWS;OEMRESOURCE;MMX;FINAL_VERSION;BKPT_SUPPORT;_CRT_SECURE_NO_DEPRECATE"
+				PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;_CRT_SECURE_NO_WARNINGS;MMX;BKPT_SUPPORT;GBA_LOGGING;FINAL_VERSION"
 				RuntimeLibrary="0"
 				BufferSecurityCheck="false"
 				EnableEnhancedInstructionSet="1"
@@ -402,7 +402,7 @@
 				FavorSizeOrSpeed="1"
 				WholeProgramOptimization="true"
 				AdditionalIncludeDirectories="..\dependencies\zlib;..\dependencies\libpng;"..\dependencies\File_Extractor-0.4.2\fex";..\dependencies\cximage;..\dependencies\msvc"
-				PreprocessorDefinitions="WIN32;WINVER=0x0500;NDEBUG;_WINDOWS;OEMRESOURCE;C_CORE;FINAL_VERSION;BKPT_SUPPORT;_CRT_SECURE_NO_WARNINGS;HAS_FILE_EXTRACTOR"
+				PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;_CRT_SECURE_NO_WARNINGS;BKPT_SUPPORT;GBA_LOGGING;FINAL_VERSION;C_CORE"
 				RuntimeLibrary="0"
 				BufferSecurityCheck="false"
 				EnableEnhancedInstructionSet="0"
diff --git a/res/DevInfo.txt b/res/DevInfo.txt
index 182ebaa6..28b88952 100644
--- a/res/DevInfo.txt
+++ b/res/DevInfo.txt
@@ -6,8 +6,8 @@ Developer Information File
 
 Known preprocessor switches:
 - SDL: Defined for the SDL version
-- DEV_VERSION: Enables logging
-- FINAL_VERSION: Defined for release versions
+- GBA_LOGGING: Enables logging for the GBA core
+- FINAL_VERSION: Defined for release versions, disables additional GBA logging and completely disables GB logging. Increases the amount of CPU cycles being emulated in one go.
 - BKPT_SUPPORT
 - MMX: Enable MMX instruction set
 - NO_OGL: Exclude OpenGL code
diff --git a/src/GBA-arm.cpp b/src/GBA-arm.cpp
index 896be7ad..82e4d459 100644
--- a/src/GBA-arm.cpp
+++ b/src/GBA-arm.cpp
@@ -57,7 +57,7 @@ static int clockTicks;
 
 static INSN_REGPARM void armUnknownInsn(u32 opcode)
 {
-#ifdef DEV_VERSION
+#ifdef GBA_LOGGING
     if (systemVerbose & VERBOSE_UNDEFINED) {
         log("Undefined ARM instruction %08x at %08x\n", opcode,
             armNextPC-4);
diff --git a/src/GBA-thumb.cpp b/src/GBA-thumb.cpp
index 7684fe3a..53047993 100644
--- a/src/GBA-thumb.cpp
+++ b/src/GBA-thumb.cpp
@@ -53,7 +53,7 @@ static int clockTicks;
 
 static INSN_REGPARM void thumbUnknownInsn(u32 opcode)
 {
-#ifdef DEV_VERSION
+#ifdef GBA_LOGGING
   if(systemVerbose & VERBOSE_UNDEFINED)
     log("Undefined THUMB instruction %04x at %08x\n", opcode, armNextPC-2);
 #endif
diff --git a/src/GBA.cpp b/src/GBA.cpp
index 15be276f..facdcf86 100644
--- a/src/GBA.cpp
+++ b/src/GBA.cpp
@@ -1721,7 +1721,7 @@ void CPUSoftwareInterrupt(int comment)
   }
 #endif
   if(useBios) {
-#ifdef DEV_VERSION
+#ifdef GBA_LOGGING
     if(systemVerbose & VERBOSE_SWI) {
       log("SWI: %08x at %08x (0x%08x,0x%08x,0x%08x,VCOUNT = %2d)\n", comment,
           armState ? armNextPC - 4: armNextPC -2,
@@ -1748,7 +1748,7 @@ void CPUSoftwareInterrupt(int comment)
     BIOS_RegisterRamReset();
     break;
   case 0x02:
-#ifdef DEV_VERSION
+#ifdef GBA_LOGGING
     if(systemVerbose & VERBOSE_SWI) {
       log("Halt: (VCOUNT = %2d)\n",
           VCOUNT);      
@@ -1759,7 +1759,7 @@ void CPUSoftwareInterrupt(int comment)
     cpuNextEvent = cpuTotalTicks;
     break;
   case 0x03:
-#ifdef DEV_VERSION
+#ifdef GBA_LOGGING
     if(systemVerbose & VERBOSE_SWI) {
       log("Stop: (VCOUNT = %2d)\n",
           VCOUNT);      
@@ -1771,7 +1771,7 @@ void CPUSoftwareInterrupt(int comment)
     cpuNextEvent = cpuTotalTicks;
     break;
   case 0x04:
-#ifdef DEV_VERSION
+#ifdef GBA_LOGGING
     if(systemVerbose & VERBOSE_SWI) {
       log("IntrWait: 0x%08x,0x%08x (VCOUNT = %2d)\n",
           reg[0].I,
@@ -1782,7 +1782,7 @@ void CPUSoftwareInterrupt(int comment)
     CPUSoftwareInterrupt();
     break;    
   case 0x05:
-#ifdef DEV_VERSION
+#ifdef GBA_LOGGING
     if(systemVerbose & VERBOSE_SWI) {
       log("VBlankIntrWait: (VCOUNT = %2d)\n", 
           VCOUNT);      
@@ -1945,7 +1945,7 @@ void CPUSoftwareInterrupt(int comment)
     BIOS_Diff16bitUnFilter();
     break;
   case 0x19:
-#ifdef DEV_VERSION
+#ifdef GBA_LOGGING
     if(systemVerbose & VERBOSE_SWI) {
       log("SoundBiasSet: 0x%08x (VCOUNT = %2d)\n",
           reg[0].I,
@@ -1964,7 +1964,7 @@ void CPUSoftwareInterrupt(int comment)
     BIOS_SndDriverJmpTableCopy();
     // let it go, because we don't really emulate this function
   default:
-#ifdef DEV_VERSION
+#ifdef GBA_LOGGING
     if(systemVerbose & VERBOSE_SWI) {
       log("SWI: %08x at %08x (0x%08x,0x%08x,0x%08x,VCOUNT = %2d)\n", comment,
           armState ? armNextPC - 4: armNextPC -2,
@@ -2115,7 +2115,7 @@ void CPUCheckDMA(int reason, int dmamask)
         destIncrement = 0;
         break;
       }      
-#ifdef DEV_VERSION
+#ifdef GBA_LOGGING
       if(systemVerbose & VERBOSE_DMA0) {
         int count = (DM0CNT_L ? DM0CNT_L : 0x4000) << 1;
         if(DM0CNT_H & 0x0400)
@@ -2173,7 +2173,7 @@ void CPUCheckDMA(int reason, int dmamask)
         break;
       }      
       if(reason == 3) {
-#ifdef DEV_VERSION
+#ifdef GBA_LOGGING
         if(systemVerbose & VERBOSE_DMA1) {
           log("DMA1: s=%08x d=%08x c=%04x count=%08x\n", dma1Source, dma1Dest,
               DM1CNT_H,
@@ -2183,7 +2183,7 @@ void CPUCheckDMA(int reason, int dmamask)
         doDMA(dma1Source, dma1Dest, sourceIncrement, 0, 4,
               0x0400);
       } else {
-#ifdef DEV_VERSION
+#ifdef GBA_LOGGING
         if(systemVerbose & VERBOSE_DMA1) {
           int count = (DM1CNT_L ? DM1CNT_L : 0x4000) << 1;
           if(DM1CNT_H & 0x0400)
@@ -2242,7 +2242,7 @@ void CPUCheckDMA(int reason, int dmamask)
         break;
       }      
       if(reason == 3) {
-#ifdef DEV_VERSION
+#ifdef GBA_LOGGING
         if(systemVerbose & VERBOSE_DMA2) {
           int count = (4) << 2;
           log("DMA2: s=%08x d=%08x c=%04x count=%08x\n", dma2Source, dma2Dest,
@@ -2253,7 +2253,7 @@ void CPUCheckDMA(int reason, int dmamask)
         doDMA(dma2Source, dma2Dest, sourceIncrement, 0, 4,
               0x0400);
       } else {
-#ifdef DEV_VERSION
+#ifdef GBA_LOGGING
         if(systemVerbose & VERBOSE_DMA2) {
           int count = (DM2CNT_L ? DM2CNT_L : 0x4000) << 1;
           if(DM2CNT_H & 0x0400)
@@ -2311,7 +2311,7 @@ void CPUCheckDMA(int reason, int dmamask)
         destIncrement = 0;
         break;
       }      
-#ifdef DEV_VERSION
+#ifdef GBA_LOGGING
       if(systemVerbose & VERBOSE_DMA3) {
         int count = (DM3CNT_L ? DM3CNT_L : 0x10000) << 1;
         if(DM3CNT_H & 0x0400)
diff --git a/src/GBAinline.h b/src/GBAinline.h
index 09275324..51dcd011 100644
--- a/src/GBAinline.h
+++ b/src/GBAinline.h
@@ -64,7 +64,7 @@ extern int cpuTotalTicks;
 static inline u32 CPUReadMemory(u32 address)
 {
 
-#ifdef DEV_VERSION
+#ifdef GBA_LOGGING
   if(address & 3) {  
     if(systemVerbose & VERBOSE_UNALIGNED_MEMORY) {
       log("Unaligned word read: %08x at %08x\n", address, armMode ?
@@ -78,7 +78,7 @@ static inline u32 CPUReadMemory(u32 address)
   case 0:
     if(reg[15].I >> 24) {
       if(address < 0x4000) {
-#ifdef DEV_VERSION
+#ifdef GBA_LOGGING
         if(systemVerbose & VERBOSE_ILLEGAL_READ) {
           log("Illegal word read: %08x at %08x\n", address, armMode ?
               armNextPC - 4 : armNextPC - 2);
@@ -141,7 +141,7 @@ static inline u32 CPUReadMemory(u32 address)
     // default
   default:
   unreadable:
-#ifdef DEV_VERSION
+#ifdef GBA_LOGGING
     if(systemVerbose & VERBOSE_ILLEGAL_READ) {
       log("Illegal word read: %08x at %08x\n", address, armMode ?
           armNextPC - 4 : armNextPC - 2);
@@ -188,7 +188,7 @@ extern u32 myROM[];
 
 static inline u32 CPUReadHalfWord(u32 address)
 {
-#ifdef DEV_VERSION      
+#ifdef GBA_LOGGING      
   if(address & 1) {
     if(systemVerbose & VERBOSE_UNALIGNED_MEMORY) {
       log("Unaligned halfword read: %08x at %08x\n", address, armMode ?
@@ -203,7 +203,7 @@ static inline u32 CPUReadHalfWord(u32 address)
   case 0:
     if (reg[15].I >> 24) {
       if(address < 0x4000) {
-#ifdef DEV_VERSION
+#ifdef GBA_LOGGING
         if(systemVerbose & VERBOSE_ILLEGAL_READ) {
           log("Illegal halfword read: %08x at %08x\n", address, armMode ?
               armNextPC - 4 : armNextPC - 2);
@@ -280,7 +280,7 @@ static inline u32 CPUReadHalfWord(u32 address)
     // default
   default:
   unreadable:
-#ifdef DEV_VERSION
+#ifdef GBA_LOGGING
     if(systemVerbose & VERBOSE_ILLEGAL_READ) {
       log("Illegal halfword read: %08x at %08x\n", address, armMode ?
           armNextPC - 4 : armNextPC - 2);
@@ -319,7 +319,7 @@ static inline u8 CPUReadByte(u32 address)
   case 0:
     if (reg[15].I >> 24) {
       if(address < 0x4000) {
-#ifdef DEV_VERSION
+#ifdef GBA_LOGGING
         if(systemVerbose & VERBOSE_ILLEGAL_READ) {
           log("Illegal byte read: %08x at %08x\n", address, armMode ?
               armNextPC - 4 : armNextPC - 2);
@@ -376,7 +376,7 @@ static inline u8 CPUReadByte(u32 address)
     // default
   default:
   unreadable:
-#ifdef DEV_VERSION
+#ifdef GBA_LOGGING
     if(systemVerbose & VERBOSE_ILLEGAL_READ) {
       log("Illegal byte read: %08x at %08x\n", address, armMode ?
           armNextPC - 4 : armNextPC - 2);
@@ -398,7 +398,7 @@ static inline u8 CPUReadByte(u32 address)
 static inline void CPUWriteMemory(u32 address, u32 value)
 {
 
-#ifdef DEV_VERSION
+#ifdef GBA_LOGGING
   if(address & 3) {
     if(systemVerbose & VERBOSE_UNALIGNED_MEMORY) {
       log("Unaligned word write: %08x to %08x from %08x\n",
@@ -481,7 +481,7 @@ static inline void CPUWriteMemory(u32 address, u32 value)
     // default
   default:
   unwritable:
-#ifdef DEV_VERSION
+#ifdef GBA_LOGGING
     if(systemVerbose & VERBOSE_ILLEGAL_WRITE) {
       log("Illegal word write: %08x to %08x from %08x\n",
           value,
@@ -495,7 +495,7 @@ static inline void CPUWriteMemory(u32 address, u32 value)
 
 static inline void CPUWriteHalfWord(u32 address, u16 value)
 {
-#ifdef DEV_VERSION
+#ifdef GBA_LOGGING
   if(address & 1) {
     if(systemVerbose & VERBOSE_UNALIGNED_MEMORY) {
       log("Unaligned halfword write: %04x to %08x from %08x\n",
@@ -583,7 +583,7 @@ static inline void CPUWriteHalfWord(u32 address, u16 value)
     goto unwritable;
   default:
   unwritable:
-#ifdef DEV_VERSION
+#ifdef GBA_LOGGING
     if(systemVerbose & VERBOSE_ILLEGAL_WRITE) {
       log("Illegal halfword write: %04x to %08x from %08x\n",
           value,
@@ -724,7 +724,7 @@ static inline void CPUWriteByte(u32 address, u8 b)
     // default
   default:
   unwritable:
-#ifdef DEV_VERSION
+#ifdef GBA_LOGGING
     if(systemVerbose & VERBOSE_ILLEGAL_WRITE) {
       log("Illegal byte write: %02x to %08x from %08x\n",
           b,
diff --git a/src/bios.cpp b/src/bios.cpp
index b8459174..7fa2a0d2 100644
--- a/src/bios.cpp
+++ b/src/bios.cpp
@@ -62,7 +62,7 @@ s16 sineTable[256] = {
 
 void BIOS_ArcTan()
 {
-#ifdef DEV_VERSION
+#ifdef GBA_LOGGING
   if(systemVerbose & VERBOSE_SWI) {
     log("ArcTan: %08x (VCOUNT=%2d)\n",
         reg[0].I,
@@ -81,7 +81,7 @@ void BIOS_ArcTan()
   a = ((s32)reg[0].I * b) >> 16;
   reg[0].I = a;
 
-#ifdef DEV_VERSION
+#ifdef GBA_LOGGING
   if(systemVerbose & VERBOSE_SWI) {
     log("ArcTan: return=%08x\n",
         reg[0].I);
@@ -91,7 +91,7 @@ void BIOS_ArcTan()
 
 void BIOS_ArcTan2()
 {
-#ifdef DEV_VERSION
+#ifdef GBA_LOGGING
   if(systemVerbose & VERBOSE_SWI) {
     log("ArcTan2: %08x,%08x (VCOUNT=%2d)\n",
         reg[0].I,
@@ -128,7 +128,7 @@ void BIOS_ArcTan2()
   }
   reg[0].I = res;
 
-#ifdef DEV_VERSION
+#ifdef GBA_LOGGING
   if(systemVerbose & VERBOSE_SWI) {
     log("ArcTan2: return=%08x\n",
         reg[0].I);
@@ -138,7 +138,7 @@ void BIOS_ArcTan2()
 
 void BIOS_BitUnPack()
 {
-#ifdef DEV_VERSION
+#ifdef GBA_LOGGING
   if(systemVerbose & VERBOSE_SWI) {
     log("BitUnPack: %08x,%08x,%08x (VCOUNT=%2d)\n",
         reg[0].I,
@@ -205,7 +205,7 @@ void BIOS_GetBiosChecksum()
 
 void BIOS_BgAffineSet()
 {
-#ifdef DEV_VERSION
+#ifdef GBA_LOGGING
   if(systemVerbose & VERBOSE_SWI) {
     log("BgAffineSet: %08x,%08x,%08x (VCOUNT=%2d)\n",
         reg[0].I,
@@ -263,7 +263,7 @@ void BIOS_BgAffineSet()
 
 void BIOS_CpuSet()
 {
-#ifdef DEV_VERSION
+#ifdef GBA_LOGGING
   if(systemVerbose & VERBOSE_SWI) {
     log("CpuSet: 0x%08x,0x%08x,0x%08x (VCOUNT=%d)\n", reg[0].I, reg[1].I,
         reg[2].I, VCOUNT);
@@ -325,7 +325,7 @@ void BIOS_CpuSet()
 
 void BIOS_CpuFastSet()
 {
-#ifdef DEV_VERSION
+#ifdef GBA_LOGGING
   if(systemVerbose & VERBOSE_SWI) {
     log("CpuFastSet: 0x%08x,0x%08x,0x%08x (VCOUNT=%d)\n", reg[0].I, reg[1].I,
         reg[2].I, VCOUNT);
@@ -373,7 +373,7 @@ void BIOS_CpuFastSet()
 
 void BIOS_Diff8bitUnFilterWram()
 {
-#ifdef DEV_VERSION
+#ifdef GBA_LOGGING
   if(systemVerbose & VERBOSE_SWI) {
     log("Diff8bitUnFilterWram: 0x%08x,0x%08x (VCOUNT=%d)\n", reg[0].I,
         reg[1].I, VCOUNT);
@@ -406,7 +406,7 @@ void BIOS_Diff8bitUnFilterWram()
 
 void BIOS_Diff8bitUnFilterVram()
 {
-#ifdef DEV_VERSION
+#ifdef GBA_LOGGING
   if(systemVerbose & VERBOSE_SWI) {
     log("Diff8bitUnFilterVram: 0x%08x,0x%08x (VCOUNT=%d)\n", reg[0].I,
         reg[1].I, VCOUNT);
@@ -449,7 +449,7 @@ void BIOS_Diff8bitUnFilterVram()
 
 void BIOS_Diff16bitUnFilter()
 {
-#ifdef DEV_VERSION
+#ifdef GBA_LOGGING
   if(systemVerbose & VERBOSE_SWI) {
     log("Diff16bitUnFilter: 0x%08x,0x%08x (VCOUNT=%d)\n", reg[0].I,
         reg[1].I, VCOUNT);
@@ -486,7 +486,7 @@ void BIOS_Diff16bitUnFilter()
 
 void BIOS_Div()
 {
-#ifdef DEV_VERSION
+#ifdef GBA_LOGGING
   if(systemVerbose & VERBOSE_SWI) {
     log("Div: 0x%08x,0x%08x (VCOUNT=%d)\n",
         reg[0].I,
@@ -504,7 +504,7 @@ void BIOS_Div()
     s32 temp = (s32)reg[0].I;
     reg[3].I = temp < 0 ? (u32)-temp : (u32)temp;
   }
-#ifdef DEV_VERSION
+#ifdef GBA_LOGGING
   if(systemVerbose & VERBOSE_SWI) {
     log("Div: return=0x%08x,0x%08x,0x%08x\n",
         reg[0].I,
@@ -516,7 +516,7 @@ void BIOS_Div()
 
 void BIOS_DivARM()
 {
-#ifdef DEV_VERSION
+#ifdef GBA_LOGGING
   if(systemVerbose & VERBOSE_SWI) {
     log("DivARM: 0x%08x, (VCOUNT=%d)\n",
         reg[0].I,
@@ -532,7 +532,7 @@ void BIOS_DivARM()
 
 void BIOS_HuffUnComp()
 {
-#ifdef DEV_VERSION
+#ifdef GBA_LOGGING
   if(systemVerbose & VERBOSE_SWI) {
     log("HuffUnComp: 0x%08x,0x%08x (VCOUNT=%d)\n",
         reg[0].I,
@@ -678,7 +678,7 @@ void BIOS_HuffUnComp()
 
 void BIOS_LZ77UnCompVram()
 {
-#ifdef DEV_VERSION
+#ifdef GBA_LOGGING
   if(systemVerbose & VERBOSE_SWI) {
     log("LZ77UnCompVram: 0x%08x,0x%08x (VCOUNT=%d)\n",
         reg[0].I,
@@ -769,7 +769,7 @@ void BIOS_LZ77UnCompVram()
 
 void BIOS_LZ77UnCompWram()
 {
-#ifdef DEV_VERSION
+#ifdef GBA_LOGGING
   if(systemVerbose & VERBOSE_SWI) {
     log("LZ77UnCompWram: 0x%08x,0x%08x (VCOUNT=%d)\n", reg[0].I, reg[1].I,
         VCOUNT);
@@ -826,7 +826,7 @@ void BIOS_LZ77UnCompWram()
 
 void BIOS_ObjAffineSet()
 {
-#ifdef DEV_VERSION
+#ifdef GBA_LOGGING
   if(systemVerbose & VERBOSE_SWI) {
     log("ObjAffineSet: 0x%08x,0x%08x,0x%08x,0x%08x (VCOUNT=%d)\n",
         reg[0].I,
@@ -947,7 +947,7 @@ void BIOS_RegisterRamReset(u32 flags)
 
 void BIOS_RegisterRamReset()
 {
-#ifdef DEV_VERSION
+#ifdef GBA_LOGGING
   if(systemVerbose & VERBOSE_SWI) {
     log("RegisterRamReset: 0x%08x (VCOUNT=%d)\n",
         reg[0].I,
@@ -960,7 +960,7 @@ void BIOS_RegisterRamReset()
 
 void BIOS_RLUnCompVram()
 {
-#ifdef DEV_VERSION
+#ifdef GBA_LOGGING
   if(systemVerbose & VERBOSE_SWI) {
     log("RLUnCompVram: 0x%08x,0x%08x (VCOUNT=%d)\n",
         reg[0].I,
@@ -1029,7 +1029,7 @@ void BIOS_RLUnCompVram()
 
 void BIOS_RLUnCompWram()
 {
-#ifdef DEV_VERSION
+#ifdef GBA_LOGGING
   if(systemVerbose & VERBOSE_SWI) {
     log("RLUnCompWram: 0x%08x,0x%08x (VCOUNT=%d)\n",
         reg[0].I,
@@ -1076,7 +1076,7 @@ void BIOS_RLUnCompWram()
 
 void BIOS_SoftReset()
 {
-#ifdef DEV_VERSION
+#ifdef GBA_LOGGING
   if(systemVerbose & VERBOSE_SWI) {
     log("SoftReset: (VCOUNT=%d)\n", VCOUNT);
   }
@@ -1110,7 +1110,7 @@ void BIOS_SoftReset()
 
 void BIOS_Sqrt()
 {
-#ifdef DEV_VERSION
+#ifdef GBA_LOGGING
   if(systemVerbose & VERBOSE_SWI) {
     log("Sqrt: %08x (VCOUNT=%2d)\n",
         reg[0].I,
@@ -1118,7 +1118,7 @@ void BIOS_Sqrt()
   }
 #endif
   reg[0].I = (u32)sqrt((double)reg[0].I);
-#ifdef DEV_VERSION
+#ifdef GBA_LOGGING
   if(systemVerbose & VERBOSE_SWI) {
     log("Sqrt: return=%08x\n",
         reg[0].I);
@@ -1128,7 +1128,7 @@ void BIOS_Sqrt()
 
 void BIOS_MidiKey2Freq()
 {
-#ifdef DEV_VERSION
+#ifdef GBA_LOGGING
   if(systemVerbose & VERBOSE_SWI) {
     log("MidiKey2Freq: WaveData=%08x mk=%08x fp=%08x\n",
         reg[0].I,
@@ -1142,7 +1142,7 @@ void BIOS_MidiKey2Freq()
   tmp = pow((double)2.f, tmp / 12.f);
   reg[0].I = (int)((double)freq / tmp);
 
-#ifdef DEV_VERSION
+#ifdef GBA_LOGGING
   if(systemVerbose & VERBOSE_SWI) {
     log("MidiKey2Freq: return %08x\n",
         reg[0].I);
@@ -1152,7 +1152,7 @@ void BIOS_MidiKey2Freq()
 
 void BIOS_SndDriverJmpTableCopy()
 {
-#ifdef DEV_VERSION
+#ifdef GBA_LOGGING
   if(systemVerbose & VERBOSE_SWI) {
     log("SndDriverJmpTableCopy: dest=%08x\n",
         reg[0].I);
diff --git a/src/sdl/debugger.cpp b/src/sdl/debugger.cpp
index 26b62bd6..1018dc8c 100644
--- a/src/sdl/debugger.cpp
+++ b/src/sdl/debugger.cpp
@@ -180,7 +180,7 @@ static DebuggerCommand debuggerCommands[] = {
 #ifndef FINAL_VERSION
   { "trace", debuggerDebug,       "Set the trace level", "<value>" },
 #endif
-#ifdef DEV_VERSION
+#ifdef GBA_LOGGING
   { "verbose", debuggerVerbose,     "Change verbose setting", "<value>" },
 #endif
   { "where", debuggerWhere,   "Show the call chain (if available)", NULL },
diff --git a/src/win32/BugReport.cpp b/src/win32/BugReport.cpp
index 391aac9e..adf38c53 100644
--- a/src/win32/BugReport.cpp
+++ b/src/win32/BugReport.cpp
@@ -142,14 +142,10 @@ CString BugReport::createReport()
   CString report = "";
   AppendFormat(report, "Emu version  : %s\r\n", VERSION);
   AppendFormat(report, "Emu Type     : %s\r\n",
-#ifdef FINAL_VERSION
-#ifdef DEV_VERSION
-               "Development Version"
-#else
-               "Normal Version"
-#endif
-#else
+#ifdef DEBUG
                "Debug Version"
+#else
+               "Release Version"
 #endif
                );
 
diff --git a/src/win32/DirectDraw.cpp b/src/win32/DirectDraw.cpp
index d97f351d..32fe4119 100644
--- a/src/win32/DirectDraw.cpp
+++ b/src/win32/DirectDraw.cpp
@@ -558,7 +558,7 @@ void DirectDrawDisplay::render()
   hret = ddsOffscreen->Lock(NULL,
                             &ddsDesc,
                             DDLOCK_WRITEONLY|
-#ifndef FINAL_VERSION
+#ifdef _DEBUG
                             DDLOCK_NOSYSLOCK|
 #endif
                             DDLOCK_SURFACEMEMORYPTR,
@@ -573,7 +573,7 @@ void DirectDrawDisplay::render()
         hret = ddsOffscreen->Lock(NULL,
                                   &ddsDesc,
                                   DDLOCK_WRITEONLY|
-#ifndef FINAL_VERSION
+#ifdef _DEBUG
                                   DDLOCK_NOSYSLOCK|
 #endif
                                   DDLOCK_SURFACEMEMORYPTR,