diff --git a/Source/Core/Common/Src/PluginVideo.h b/Source/Core/Common/Src/PluginVideo.h
index 70ae8f39ec..127e24361d 100644
--- a/Source/Core/Common/Src/PluginVideo.h
+++ b/Source/Core/Common/Src/PluginVideo.h
@@ -7,7 +7,7 @@
 namespace Common {
     typedef void (__cdecl* TVideo_Prepare)();
     typedef void (__cdecl* TVideo_SendFifoData)(u8*,u32);
-    typedef void (__cdecl* TVideo_UpdateXFB)(u8*, u32, u32, s32, BOOL);
+    typedef void (__cdecl* TVideo_UpdateXFB)(u8*, u32, u32, s32, bool);
     typedef bool (__cdecl* TVideo_Screenshot)(const char* filename);
     typedef void (__cdecl* TVideo_EnterLoop)();
     typedef void (__cdecl* TVideo_AddMessage)(const char* pstr, unsigned int milliseconds);
diff --git a/Source/Core/Core/Src/HW/CommandProcessor.cpp b/Source/Core/Core/Src/HW/CommandProcessor.cpp
index 3f14cfe4f6..6de8811f11 100644
--- a/Source/Core/Core/Src/HW/CommandProcessor.cpp
+++ b/Source/Core/Core/Src/HW/CommandProcessor.cpp
@@ -151,10 +151,10 @@ u16 m_tokenReg;
 
 SCPFifoStruct fifo; //This one is shared between gfx thread and emulator thread
 static u32 fake_GPWatchdogLastToken = 0;
-static BOOL fake_CommandProcessorNotUsed = TRUE; // This is used by VI when homebrews use directly XFB without FIFO and CP
+static bool fake_CommandProcessorNotUsed = true; // This is used by VI when homebrews use directly XFB without FIFO and CP
 
 // hack: This is used by VI when homebrews use directly XFB without FIFO and CP
-BOOL IsCommandProcessorNotUsed()
+bool IsCommandProcessorNotUsed()
 {
 	return fake_CommandProcessorNotUsed;
 }
@@ -228,7 +228,7 @@ void Init()
 	fifo.CPReadIdle = 1;
 
 	et_UpdateInterrupts = CoreTiming::RegisterEvent("UpdateInterrupts", UpdateInterrupts_Wrapper);
-	fake_CommandProcessorNotUsed = TRUE;
+	fake_CommandProcessorNotUsed = true;
 }
 
 void Shutdown()
@@ -418,7 +418,7 @@ void Write16(const u16 _Value, const u32 _Address)
 
 	case CTRL_REGISTER:
 		{
-			fake_CommandProcessorNotUsed = FALSE;
+			fake_CommandProcessorNotUsed = false;
 			UCPCtrlReg tmpCtrl(_Value);
 
 			Common::SyncInterlockedExchange((LONG*)&fifo.bFF_GPReadEnable,	tmpCtrl.GPReadEnable);
diff --git a/Source/Core/Core/Src/HW/CommandProcessor.h b/Source/Core/Core/Src/HW/CommandProcessor.h
index 58fff402b3..68a9aacb35 100644
--- a/Source/Core/Core/Src/HW/CommandProcessor.h
+++ b/Source/Core/Core/Src/HW/CommandProcessor.h
@@ -80,7 +80,7 @@ void IncrementGPWDToken();
 void WaitForFrameFinish();
 
 // hack: This is used by VI when homebrews use directly XFB without FIFO and CP
-BOOL IsCommandProcessorNotUsed();
+bool IsCommandProcessorNotUsed();
 
 } // end of namespace CommandProcessor
 
diff --git a/Source/Core/VideoCommon/Src/Fifo.cpp b/Source/Core/VideoCommon/Src/Fifo.cpp
index ea53bed0c2..6548f75744 100644
--- a/Source/Core/VideoCommon/Src/Fifo.cpp
+++ b/Source/Core/VideoCommon/Src/Fifo.cpp
@@ -26,7 +26,7 @@
 extern u8* g_pVideoData;
 
 // TODO (mb2): move/rm this global
-volatile BOOL g_XFBUpdateRequested = FALSE;
+volatile u32 g_XFBUpdateRequested = FALSE;
 
 #ifndef _WIN32
 static bool fifoStateRun = true;
diff --git a/Source/Core/VideoCommon/Src/VideoCommon.h b/Source/Core/VideoCommon/Src/VideoCommon.h
index 10e1c50cfd..a035072cf6 100644
--- a/Source/Core/VideoCommon/Src/VideoCommon.h
+++ b/Source/Core/VideoCommon/Src/VideoCommon.h
@@ -44,7 +44,7 @@ enum {
 
 extern SVideoInitialize g_VideoInitialize;
 // (mb2) for XFB update hack. TODO: find a static better place
-extern volatile BOOL g_XFBUpdateRequested;
+extern volatile u32 g_XFBUpdateRequested;
 
 void DebugLog(const char* _fmt, ...);
 
diff --git a/Source/PluginSpecs/pluginspecs_video.h b/Source/PluginSpecs/pluginspecs_video.h
index 43b8edaee7..d4e11f7df0 100644
--- a/Source/PluginSpecs/pluginspecs_video.h
+++ b/Source/PluginSpecs/pluginspecs_video.h
@@ -104,7 +104,7 @@ EXPORT void CALL Video_SendFifoData(u8* _uData, u32 len);
 // input:    pointer to the XFB, width and height of the XFB
 // output:   none
 //
-EXPORT void CALL Video_UpdateXFB(u8* _pXFB, u32 _dwWidth, u32 _dwHeight, s32 _dwYOffset, BOOL scheduling);
+EXPORT void CALL Video_UpdateXFB(u8* _pXFB, u32 _dwWidth, u32 _dwHeight, s32 _dwYOffset, bool scheduling);
 
 // __________________________________________________________________________________________________
 // Function: Video_Screenshot
diff --git a/Source/Plugins/Plugin_VideoDX9/Src/main.cpp b/Source/Plugins/Plugin_VideoDX9/Src/main.cpp
index 8889ff3e1d..1146d5ab13 100644
--- a/Source/Plugins/Plugin_VideoDX9/Src/main.cpp
+++ b/Source/Plugins/Plugin_VideoDX9/Src/main.cpp
@@ -234,7 +234,7 @@ void Video_Stop(void)
 {
 }
 
-void Video_UpdateXFB(u8* /*_pXFB*/, u32 /*_dwWidth*/, u32 /*_dwHeight*/, s32 /*_dwYOffset*/, BOOL /*scheduling*/)
+void Video_UpdateXFB(u8* /*_pXFB*/, u32 /*_dwWidth*/, u32 /*_dwHeight*/, s32 /*_dwYOffset*/, bool /*scheduling*/)
 {
 	/*
 	ConvertXFB(tempBuffer, _pXFB, _dwWidth, _dwHeight);
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/main.cpp b/Source/Plugins/Plugin_VideoOGL/Src/main.cpp
index 204ef9a5ce..0c1d5e9608 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/main.cpp
+++ b/Source/Plugins/Plugin_VideoOGL/Src/main.cpp
@@ -361,7 +361,7 @@ unsigned int Video_Screenshot(TCHAR* _szFilename)
 }
 
 
-void Video_UpdateXFB(u8* _pXFB, u32 _dwWidth, u32 _dwHeight, s32 _dwYOffset, BOOL scheduling)
+void Video_UpdateXFB(u8* _pXFB, u32 _dwWidth, u32 _dwHeight, s32 _dwYOffset, bool scheduling)
 {
 	if(g_Config.bUseXFB && XFB_isInit())
 	{