diff --git a/desmume/src/GPU.cpp b/desmume/src/GPU.cpp
index 8d1edb783..060e8fbdf 100644
--- a/desmume/src/GPU.cpp
+++ b/desmume/src/GPU.cpp
@@ -2051,8 +2051,8 @@ void GPU_ligne(NDS_Screen * screen, u16 l)
 				T2WriteWord(dst, i << 1, c&0xFFFF); i++;
 				T2WriteWord(dst, i << 1, c>>16); i++;
 			}
-else
-		printlog("FIFO MAIN_MEMORY_DISP_FIFO\n");
+#else
+		INFO("FIFO MAIN_MEMORY_DISP_FIFO\n");
 #endif
 			return;
 	}
diff --git a/desmume/src/MMU.cpp b/desmume/src/MMU.cpp
index 92fac77be..36f619f3f 100644
--- a/desmume/src/MMU.cpp
+++ b/desmume/src/MMU.cpp
@@ -90,7 +90,7 @@ void mmu_log_debug(u32 adr, u8 proc, const char *fmt, ...)
 			_vsnprintf(msg,511,fmt,list);
 		va_end(list);
 
-		LOG("MMU ARM%s 0x%08X: %s\n",proc==ARMCPU_ARM9?"9":"7",adr, msg);
+		INFO("MMU ARM%s 0x%08X: %s\n",proc==ARMCPU_ARM9?"9":"7",adr, msg);
 	}
 }
 #else
@@ -232,7 +232,7 @@ static u8	MMU_VRAMcntSaved[10];
 void MMU_Init(void) {
 	int i;
 
-	LOG("MMU init\n");
+	INFO("MMU init\n");
 
 	memset(&MMU, 0, sizeof(MMU_struct));
 
@@ -275,7 +275,7 @@ void MMU_Init(void) {
 } 
 
 void MMU_DeInit(void) {
-	LOG("MMU deinit\n");
+	INFO("MMU deinit\n");
     if (MMU.fw.fp)
        fclose(MMU.fw.fp);
     mc_free(&MMU.fw);      
diff --git a/desmume/src/NDSSystem.cpp b/desmume/src/NDSSystem.cpp
index e4dadc10a..256ab0271 100644
--- a/desmume/src/NDSSystem.cpp
+++ b/desmume/src/NDSSystem.cpp
@@ -1541,7 +1541,7 @@ NDS_exec(s32 nb, BOOL force)
 			if (tt == 3) continue;
 			if (tt == 12) continue;
 			if (tt == 18) continue;
-			if (MMU.reg_IE[0]&(1<<tt)) printlog("wait IRQ%i\n", tt);
+			if (MMU.reg_IE[0]&(1<<tt)) INFO("wait IRQ%i\n", tt);
 		}*/
 
 		//if(MMU.reg_IE[0]&(1<<0)) gfx3d_VBlankSignal();
diff --git a/desmume/src/OGLRender.cpp b/desmume/src/OGLRender.cpp
index 63b4a21dd..6e2b79fec 100644
--- a/desmume/src/OGLRender.cpp
+++ b/desmume/src/OGLRender.cpp
@@ -559,7 +559,7 @@ static void setTexture(unsigned int format, unsigned int texpal)
 	glLoadIdentity ();
 	glScaled (texcache[i].invSizeX, texcache[i].invSizeY, 1.0f);
 
-	//printlog("Texture %03i - format=%08X; pal=%04X (mode %X, width %04i, height %04i)\n",i, texcache[i].frm, texcache[i].pal, texcache[i].mode, sizeX, sizeY);
+	//INFO("Texture %03i - format=%08X; pal=%04X (mode %X, width %04i, height %04i)\n",i, texcache[i].frm, texcache[i].pal, texcache[i].mode, sizeX, sizeY);
 	
 	//============================================================================ Texture render
 	palZeroTransparent = (1-((format>>29)&1))*255;						// shash: CONVERT THIS TO A TABLE :)
@@ -1048,7 +1048,7 @@ static void GL_ReadFramebuffer()
 	//		colorPtr[2] = 255;
 	//	} else {
 	//		colorPtr[0] = colorPtr[1] = colorPtr[2] = zval*255;
-	//		//printlog("%f %f %d\n",zval, zval*255,colorPtr[0]);
+	//		//INFO("%f %f %d\n",zval, zval*255,colorPtr[0]);
 	//	}
 
 	//}
diff --git a/desmume/src/gfx3d.cpp b/desmume/src/gfx3d.cpp
index ac8e26bc4..90a8bee4e 100644
--- a/desmume/src/gfx3d.cpp
+++ b/desmume/src/gfx3d.cpp
@@ -701,7 +701,7 @@ void gfx3d_glMaterial1(unsigned long val)
 
 void gfx3d_glShininess (unsigned long val)
 {
-	//printlog("Shininess=%i\n",val);
+	//INFO("Shininess=%i\n",val);
 }
 
 void gfx3d_UpdateToonTable(void* toonTable)
@@ -921,18 +921,18 @@ void gfx3d_glPosTest(unsigned long v)
 
 void gfx3d_glVecTest(unsigned long v)
 {
-	//printlog("NDS_glVecTest\n");
+	//INFO("NDS_glVecTest\n");
 }
 
 void gfx3d_glGetPosRes(unsigned int index)
 {
-	//printlog("NDS_glGetPosRes\n");
+	//INFO("NDS_glGetPosRes\n");
 	//return 0;
 }
 
 void gfx3d_glGetVecRes(unsigned int index)
 {
-	//printlog("NDS_glGetVecRes\n");
+	//INFO("NDS_glGetVecRes\n");
 	//return 0;
 }
 
diff --git a/desmume/src/rtc.cpp b/desmume/src/rtc.cpp
index 166f28e50..fc7fd813c 100644
--- a/desmume/src/rtc.cpp
+++ b/desmume/src/rtc.cpp
@@ -88,13 +88,13 @@ INLINE void rtcPost(u8 data)
 				rtc.cmd = data;
 				else 
 				{
-					//printlog("RTC ERROR: command not supported\n");
+					//INFO("RTC ERROR: command not supported\n");
 					return;
 				}
 				
 		rtc.stat = (rtc.cmd & 0x01);
 		rtc.cmd = (rtc.cmd & 0x0E)>>1;
-		//printlog("+++++RTC: execute command 0x%02X (%s)\n", rtc.cmd, rtc.stat?"read":"write");
+		//INFO("+++++RTC: execute command 0x%02X (%s)\n", rtc.cmd, rtc.stat?"read":"write");
 		if (!rtc.stat)
 		{
 			rtc.cmdSize = cmdSizes[rtc.cmd];
@@ -108,16 +108,16 @@ INLINE void rtcPost(u8 data)
 			rtc.bitSizeRead = 8;
 			rtc.dataRead1 = 0;
 			rtc.dataRead2 = 0;
-			//printlog("RTC: read %X\n", rtc.cmd);
+			//INFO("RTC: read %X\n", rtc.cmd);
 			switch (rtc.cmd)
 			{
 				case 0:				// status register 1
-					//printlog("RTC: read status 1 (%X) %s\n", rtc.regStatus1, rtc.revBits?"rev":"fwd");
+					//INFO("RTC: read status 1 (%X) %s\n", rtc.regStatus1, rtc.revBits?"rev":"fwd");
 					rtc.dataRead1 = rtc.regStatus1;
 					rtc.regStatus1 &= 0x0F;
 					break;
 				case 1:				// status register 2
-					//printlog("RTC: read status 2 %s\n", rtc.revBits?"rev":"fwd");
+					//INFO("RTC: read status 2 %s\n", rtc.revBits?"rev":"fwd");
 					rtc.dataRead1 = rtc.regStatus2;
 					break;
 				case 2:				// date & time
@@ -147,7 +147,7 @@ INLINE void rtcPost(u8 data)
 					}
 				case 3:				// time
 					{
-						//printlog("RTC: read time\n");
+						//INFO("RTC: read time\n");
 						time_t	tm;
 						time(&tm);
 						struct tm *tm_local= localtime(&tm);
@@ -167,16 +167,16 @@ INLINE void rtcPost(u8 data)
 						break;
 					}
 				case 4:				// freq/alarm 1
-					//printlog("RTC: read freq");
+					//INFO("RTC: read freq");
 					break;
 				case 5:				// alarm 2
-					//printlog("RTC: read alarm 2\n");
+					//INFO("RTC: read alarm 2\n");
 					break;
 				case 6:				// clock adjust
-					//printlog("RTC: read clock adjust\n");
+					//INFO("RTC: read clock adjust\n");
 					break;
 				case 7:				// free register
-					//printlog("RTC: read free register\n");
+					//INFO("RTC: read free register\n");
 					break;
 				default:
 					rtc.bitSizeRead = 0;
@@ -186,39 +186,39 @@ INLINE void rtcPost(u8 data)
 		return;
 	}
 	rtc.cmdSize--;
-	//printlog("RTC: write %X val=%X\n", rtc.cmd, data);
+	//INFO("RTC: write %X val=%X\n", rtc.cmd, data);
 	switch (rtc.cmd)
 	{
 		case 0:				// status1
-			//printlog("RTC: write status 1 (%X)\n", data);
+			//INFO("RTC: write status 1 (%X)\n", data);
 			rtc.regStatus1 = data;
 			if (rtc.regStatus1 & 0x10) 
 			{
-				//printlog("IRQ7\n");
+				//INFO("IRQ7\n");
 				NDS_makeARM7Int(7);
 			}
 			break;
 		case 1:				// status register 2
 			rtc.regStatus2 = data;
-			//printlog("RTC: write status 2 (%X)\n", data);
+			//INFO("RTC: write status 2 (%X)\n", data);
 			break;
 		case 2:				// date & time
-			//printlog("RTC: write date & time (%X)\n", data);
+			//INFO("RTC: write date & time (%X)\n", data);
 			break;
 		case 3:				// time
-			//printlog("RTC: write time (%X)\n", data);
+			//INFO("RTC: write time (%X)\n", data);
 			break;
 		case 4:				// freq/alarm 1
-			//printlog("RTC: write freq (%X)", data);
+			//INFO("RTC: write freq (%X)", data);
 			break;
 		case 5:				// alarm 2
-			//printlog("RTC: write alarm 2 (%X)\n", data);
+			//INFO("RTC: write alarm 2 (%X)\n", data);
 			break;
 		case 6:				// clock adjust
-			//printlog("RTC: write clock adjust (%X)\n", data);
+			//INFO("RTC: write clock adjust (%X)\n", data);
 			break;
 		case 7:				// free register
-			//printlog("RTC: write free register (%X)\n", data);
+			//INFO("RTC: write free register (%X)\n", data);
 			break;
 
 	}
@@ -251,7 +251,7 @@ void rtcWrite(u16 val)
 		rtc.bitPosWrite++;
 		if (rtc.bitPosWrite == 8)
 		{
-			//printlog("RTC: write\n");
+			//INFO("RTC: write\n");
 			rtcPost(rtc.dataWrite);
 			rtc.bitPosWrite = 0;
 			rtc.dataWrite = 0;
diff --git a/desmume/src/windows/disView.cpp b/desmume/src/windows/disView.cpp
index 874e14f9e..5d7509987 100644
--- a/desmume/src/windows/disView.cpp
+++ b/desmume/src/windows/disView.cpp
@@ -316,7 +316,7 @@ BOOL CALLBACK ViewDisasm_ARM7Proc (HWND hwnd, UINT message, WPARAM wParam, LPARA
 						DisView7 = NULL;
 					}
 					DisViewWnd[1] = NULL;
-					//printlog("Close ARM7 disassembler\n");
+					//INFO("Close ARM7 disassembler\n");
 					PostQuitMessage(0);
 					return 1;
 				}
@@ -556,7 +556,7 @@ BOOL CALLBACK ViewDisasm_ARM9Proc (HWND hwnd, UINT message, WPARAM wParam, LPARA
 						DisView9 = NULL;
 					}
 					DisViewWnd[0] = NULL;
-					//printlog("Close ARM9 disassembler\n");
+					//INFO("Close ARM9 disassembler\n");
 					PostQuitMessage(0);
 					return 1;
 				}
diff --git a/desmume/src/windows/inputdx.cpp b/desmume/src/windows/inputdx.cpp
index 2f984ce88..f4a3e50c7 100644
--- a/desmume/src/windows/inputdx.cpp
+++ b/desmume/src/windows/inputdx.cpp
@@ -539,7 +539,7 @@ void INPUTCLASS::process()
 		hr=IDirectInputDevice8_GetDeviceState(pKeyboard,256,cDIBuf);
 		if (FAILED(hr)) 
 		{
-			//printlog("DInput: keyboard acquire\n");
+			//INFO("DInput: keyboard acquire\n");
 			IDirectInputDevice8_Acquire(pKeyboard);
 		}
 	}
diff --git a/desmume/src/windows/lightView.cpp b/desmume/src/windows/lightView.cpp
index dfa03e88d..9d92bdf45 100644
--- a/desmume/src/windows/lightView.cpp
+++ b/desmume/src/windows/lightView.cpp
@@ -126,7 +126,7 @@ BOOL CALLBACK ViewLightsProc (HWND hwnd, UINT message, WPARAM wParam, LPARAM lPa
 					delete LightsView;
 					LightsView = NULL;
 				}
-			//printlog("Close lights viewer dialog\n");
+			//INFO("Close lights viewer dialog\n");
 			PostQuitMessage(0);
 			break;
 
diff --git a/desmume/src/windows/main.cpp b/desmume/src/windows/main.cpp
index 68157186a..94d0636e3 100644
--- a/desmume/src/windows/main.cpp
+++ b/desmume/src/windows/main.cpp
@@ -333,7 +333,7 @@ void ResizingLimit(int wParam, RECT *rc)
 	u32 minX = 256;
 	u32 minY = 414;
 
-	//printlog("width=%i; height=%i\n", width, height);
+	//INFO("width=%i; height=%i\n", width, height);
 
 	if (GPU_rotation == 90 || GPU_rotation == 270)
 	{
@@ -543,7 +543,7 @@ void UpdateRecentRomsMenu()
 		moo.fType = 0;
 		moo.wID = baseid + x;
 		moo.dwTypeData = (LPSTR)tmp.c_str();
-		//printlog("Inserting: %s\n",tmp.c_str());  //Debug
+		//INFO("Inserting: %s\n",tmp.c_str());  //Debug
 		InsertMenuItem(recentromsmenu, 0, 1, &moo);
 	}
 	//-----------------------------------------------------------------------
@@ -585,7 +585,7 @@ void UpdateRecentRoms(char* filename)
 
 	//Debug
 	//for (int x = 0; x < RecentRoms.size(); x++)
-	//	printlog("Recent ROM: %s\n",RecentRoms[x].c_str());
+	//	INFO("Recent ROM: %s\n",RecentRoms[x].c_str());
 
 	UpdateRecentRomsMenu();
 }
@@ -995,7 +995,7 @@ void NDS_Pause()
 		paused = TRUE;
 		SPU_Pause(1);
 		while (!paused) {}
-		LOG("Paused\n");
+		INFO("Paused\n");
 	}
 }
 
@@ -1006,7 +1006,7 @@ void NDS_UnPause()
 		paused = FALSE;
 		execute = TRUE;
 		SPU_Pause(0);
-		LOG("Unpaused\n");
+		INFO("Unpaused\n");
    }
 }
 
@@ -1675,7 +1675,7 @@ LRESULT CALLBACK WindowProcedure (HWND hwnd, UINT message, WPARAM wParam, LPARAM
 				ResizingLimit(wParam, rc);
 				if (ForceRatio)
 					ScaleScreen(hwnd, wParam, rc);
-				//printlog("sizing: width=%i; height=%i\n", rc->right - rc->left, rc->bottom - rc->top);
+				//INFO("sizing: width=%i; height=%i\n", rc->right - rc->left, rc->bottom - rc->top);
 			}
 			break;
 		case WM_SIZE:
diff --git a/desmume/src/windows/mapView.cpp b/desmume/src/windows/mapView.cpp
index 12877d37d..98576706f 100644
--- a/desmume/src/windows/mapView.cpp
+++ b/desmume/src/windows/mapView.cpp
@@ -252,7 +252,7 @@ BOOL CALLBACK ViewMapsProc (HWND hwnd, UINT message, WPARAM wParam, LPARAM lPara
 					delete MapView;
 					MapView = NULL;
 				}
-				//printlog("Close Map view dialog\n");
+				//INFO("Close Map view dialog\n");
 				PostQuitMessage(0);
 				return 0;
 			}
diff --git a/desmume/src/windows/matrixView.cpp b/desmume/src/windows/matrixView.cpp
index 95fe1fae7..879f6e0e8 100644
--- a/desmume/src/windows/matrixView.cpp
+++ b/desmume/src/windows/matrixView.cpp
@@ -191,7 +191,7 @@ BOOL CALLBACK ViewMatricesProc (HWND hwnd, UINT message, WPARAM wParam, LPARAM l
 						delete MatrixView;
 						MatrixView = NULL;
 					}
-					//printlog("Close Matrix view dialog\n");
+					//INFO("Close Matrix view dialog\n");
 					PostQuitMessage(0);
 					return 0;
 				}
diff --git a/desmume/src/windows/memView.cpp b/desmume/src/windows/memView.cpp
index c27bcb935..98255ecec 100644
--- a/desmume/src/windows/memView.cpp
+++ b/desmume/src/windows/memView.cpp
@@ -82,7 +82,6 @@ LRESULT MemViewBox_OnPaint(HWND hwnd, memview_struct * win, WPARAM wParam, LPARA
         r.right = rect.right-3;
         
         adr = win->curr_ligne*0x10;
-		//printlog("curr_ligne=%i\n", win->curr_ligne);
         
         for(i=0; i<nbligne; ++i)
         {
@@ -236,7 +235,7 @@ bool CALLBACK ViewMem_ARM7Proc (HWND hwnd, UINT message, WPARAM wParam, LPARAM l
 					delete MemView7;
 					MemView7 = NULL;
 				}
-				//printlog("Close ARM7 memory dialog\n");
+				//INFO("Close ARM7 memory dialog\n");
 				PostQuitMessage(0);
 				return 0;
 			}
@@ -421,7 +420,7 @@ bool CALLBACK ViewMem_ARM9Proc (HWND hwnd, UINT message, WPARAM wParam, LPARAM l
 					delete MemView9;
 					MemView9 = NULL;
 				}
-				//printlog("Close ARM9 memory dialog\n");
+				//INFO("Close ARM9 memory dialog\n");
 				PostQuitMessage(0);
 				return 0;
 			}
diff --git a/desmume/src/windows/oamView.cpp b/desmume/src/windows/oamView.cpp
index 39bac287f..d7da44de8 100644
--- a/desmume/src/windows/oamView.cpp
+++ b/desmume/src/windows/oamView.cpp
@@ -240,7 +240,7 @@ BOOL CALLBACK ViewOAMProc (HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam
 					delete OAMView;
 					OAMView = NULL;
 				}
-				//printlog("Close OAM viewer dialog\n");
+				//INFO("Close OAM viewer dialog\n");
 				PostQuitMessage(0);
 				return 0;
 			}
diff --git a/desmume/src/windows/palView.cpp b/desmume/src/windows/palView.cpp
index dd20a081e..5ef6f8b28 100644
--- a/desmume/src/windows/palView.cpp
+++ b/desmume/src/windows/palView.cpp
@@ -137,7 +137,7 @@ BOOL CALLBACK ViewPalProc (HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam
 					delete PalView;
 					PalView = NULL;
 				}
-				//printlog("Close Palette view dialog\n");
+				//INFO("Close Palette view dialog\n");
 				PostQuitMessage(0);
 				return 0;
 			}
diff --git a/desmume/src/windows/tileView.cpp b/desmume/src/windows/tileView.cpp
index 16841d72b..ba338b9f2 100644
--- a/desmume/src/windows/tileView.cpp
+++ b/desmume/src/windows/tileView.cpp
@@ -398,7 +398,7 @@ BOOL CALLBACK ViewTilesProc (HWND hwnd, UINT message, WPARAM wParam, LPARAM lPar
 					delete TileView;
 					TileView = NULL;
 				}
-				//printlog("Close Tile view dialog\n");
+				//INFO("Close Tile view dialog\n");
 				PostQuitMessage(0);
                  return 1;
 			case WM_TIMER: