diff --git a/Minecraft.Client/Platform/Common/XUI/XUI_Control_ComboBox.h b/Minecraft.Client/Platform/Common/XUI/XUI_Control_ComboBox.h
index 28b611871..87138c5be 100644
--- a/Minecraft.Client/Platform/Common/XUI/XUI_Control_ComboBox.h
+++ b/Minecraft.Client/Platform/Common/XUI/XUI_Control_ComboBox.h
@@ -10,8 +10,8 @@ public:
 		LPCWSTR pwszText;
 		LPCWSTR pwszImage;
 		HXUIBRUSH hXuiBrush;
-		BOOL fChecked;
-		BOOL fEnabled;
+		bool fChecked;
+		bool fEnabled;
 	} 
 	LIST_ITEM_INFO;
 
@@ -50,4 +50,4 @@ protected:
 	HRESULT OnNotifyPressEx(HXUIOBJ hObjPressed, XUINotifyPress* pNotifyPressData,BOOL& rfHandled);
 
 
-};
\ No newline at end of file
+};
diff --git a/Minecraft.Client/Platform/Common/XUI/XUI_Ctrl_4JList.h b/Minecraft.Client/Platform/Common/XUI/XUI_Ctrl_4JList.h
index 11bdd4564..0cd03b218 100644
--- a/Minecraft.Client/Platform/Common/XUI/XUI_Ctrl_4JList.h
+++ b/Minecraft.Client/Platform/Common/XUI/XUI_Ctrl_4JList.h
@@ -17,8 +17,8 @@ public:
 		LPCWSTR pwszText;
 		LPCWSTR pwszImage;
 		HXUIBRUSH hXuiBrush;
-		BOOL fChecked;
-		BOOL fEnabled;
+		bool fChecked;
+		bool fEnabled;
 		bool bIsDamaged; // damaged save
 		FILETIME fTime;
 		int iData; // user data
diff --git a/Minecraft.Client/Platform/Common/XUI/XUI_Ctrl_EnchantmentBook.h b/Minecraft.Client/Platform/Common/XUI/XUI_Ctrl_EnchantmentBook.h
index 93f0239ea..c9685b569 100644
--- a/Minecraft.Client/Platform/Common/XUI/XUI_Ctrl_EnchantmentBook.h
+++ b/Minecraft.Client/Platform/Common/XUI/XUI_Ctrl_EnchantmentBook.h
@@ -38,7 +38,7 @@ private:
     float flip, oFlip, flipT, flipA;
     float open, oOpen;
 
-	BOOL m_bDirty;
+	bool m_bDirty;
 	float m_fScale,m_fAlpha;
 	int	m_iPad;
 	CXuiSceneEnchant *m_containerScene;
@@ -48,4 +48,4 @@ private:
 	float m_fRawWidth,m_fRawHeight;
 
 	void tickBook();
-};
\ No newline at end of file
+};
diff --git a/Minecraft.Client/Platform/Common/XUI/XUI_Ctrl_MinecraftPlayer.h b/Minecraft.Client/Platform/Common/XUI/XUI_Ctrl_MinecraftPlayer.h
index 70692bfe9..4ae9275be 100644
--- a/Minecraft.Client/Platform/Common/XUI/XUI_Ctrl_MinecraftPlayer.h
+++ b/Minecraft.Client/Platform/Common/XUI/XUI_Ctrl_MinecraftPlayer.h
@@ -31,7 +31,7 @@ protected:
 	HRESULT OnRender(XUIMessageRender *pRenderData, BOOL &rfHandled);
 
 private:
-	BOOL m_bDirty;
+	bool m_bDirty;
 	float m_fScale,m_fAlpha;
 	int	m_iPad;
 	CXuiSceneInventory *m_containerScene;
@@ -39,4 +39,4 @@ private:
 	float m_fScreenWidth,m_fScreenHeight;
 	float m_fRawWidth,m_fRawHeight;
 
-};
\ No newline at end of file
+};
diff --git a/Minecraft.Client/Platform/Common/XUI/XUI_Ctrl_MinecraftSkinPreview.h b/Minecraft.Client/Platform/Common/XUI/XUI_Ctrl_MinecraftSkinPreview.h
index ccec743f3..91e734aa5 100644
--- a/Minecraft.Client/Platform/Common/XUI/XUI_Ctrl_MinecraftSkinPreview.h
+++ b/Minecraft.Client/Platform/Common/XUI/XUI_Ctrl_MinecraftSkinPreview.h
@@ -73,7 +73,7 @@ private:
 	bool bindTexture(const std::wstring& urlTexture, int backupTexture);
 	bool bindTexture(const std::wstring& urlTexture, const std::wstring& backupTexture);
 
-	BOOL m_bDirty;
+	bool m_bDirty;
 	float m_fScale,m_fAlpha;
 
 	std::wstring m_customTextureUrl;
@@ -93,7 +93,7 @@ private:
 	float m_walkAnimPos;
 
 	bool m_bAutoRotate, m_bRotatingLeft;
-	BYTE m_rotateTick;
+	int m_rotateTick;
 	float m_fTargetRotation, m_fOriginalRotation;
 	int m_framesAnimatingRotation;
 	bool m_bAnimatingToFacing;
@@ -103,4 +103,4 @@ private:
 	ESkinPreviewAnimations m_currentAnimation;
 	//std::vector<Model::SKIN_BOX *> *m_pvAdditionalBoxes;
 	std::vector<ModelPart *> *m_pvAdditionalModelParts;
-};
\ No newline at end of file
+};
diff --git a/Minecraft.Client/Platform/Common/XUI/XUI_Ctrl_MinecraftSlot.h b/Minecraft.Client/Platform/Common/XUI/XUI_Ctrl_MinecraftSlot.h
index 1f337f692..7c9aca131 100644
--- a/Minecraft.Client/Platform/Common/XUI/XUI_Ctrl_MinecraftSlot.h
+++ b/Minecraft.Client/Platform/Common/XUI/XUI_Ctrl_MinecraftSlot.h
@@ -39,9 +39,9 @@ protected:
 
 private:
 	std::shared_ptr<ItemInstance> m_item;
-	BOOL m_bDirty;
-	INT m_iPassThroughDataAssociation;
-	INT m_iPassThroughIdAssociation;
+	bool m_bDirty;
+	int m_iPassThroughDataAssociation;
+	int m_iPassThroughIdAssociation;
 	float m_fScale,m_fAlpha;
 	int m_iPad;
 	int m_iID;
@@ -56,4 +56,4 @@ private:
 	ItemRenderer *m_pItemRenderer;
 
 	static LPCWSTR xzpIcons[15];
-};
\ No newline at end of file
+};
diff --git a/Minecraft.Client/Platform/Common/XUI/XUI_Ctrl_SlotItemCtrlBase.h b/Minecraft.Client/Platform/Common/XUI/XUI_Ctrl_SlotItemCtrlBase.h
index c2423d829..f2a350ef5 100644
--- a/Minecraft.Client/Platform/Common/XUI/XUI_Ctrl_SlotItemCtrlBase.h
+++ b/Minecraft.Client/Platform/Common/XUI/XUI_Ctrl_SlotItemCtrlBase.h
@@ -24,7 +24,7 @@ class CXuiCtrlSlotItemCtrlBase
 {
 private:
 	// 4J WESTY : Pointer Prototype : Added to support prototype only.
-	BOOL	m_bSkipDefaultNavigation;
+	bool	m_bSkipDefaultNavigation;
 
 public:
 	// We define a lot of functions as virtual. These should be implemented to call the protected version by
@@ -56,7 +56,7 @@ public:
 	int	 GetObjectCount( HXUIOBJ hObj );
 
 	// 4J WESTY : Pointer Prototype : Added to support prototype only.
-	void	SetSkipsDefaultNavigation( BOOL bSkipDefaultNavigation )			{ m_bSkipDefaultNavigation = bSkipDefaultNavigation; }
+	void	SetSkipsDefaultNavigation( bool bSkipDefaultNavigation )			{ m_bSkipDefaultNavigation = bSkipDefaultNavigation; }
 
 	// 4J WESTY : Pointer Prototype : Added to support prototype only.
 	int		GetEmptyStackSpace( HXUIOBJ hObj );		// Returns number of items that can still be stacked into this slot.
@@ -75,4 +75,4 @@ protected:
 	HRESULT OnControlNavigate(HXUIOBJ hObj, XUIMessageControlNavigate *pControlNavigateData, BOOL& bHandled);
 
 	HRESULT OnKeyDown(HXUIOBJ hObj, XUIMessageInput *pInputData, BOOL& bHandled);
-};
\ No newline at end of file
+};
diff --git a/Minecraft.Client/Platform/Common/XUI/XUI_Ctrl_SplashPulser.h b/Minecraft.Client/Platform/Common/XUI/XUI_Ctrl_SplashPulser.h
index 959bb0e55..b8ba5cb77 100644
--- a/Minecraft.Client/Platform/Common/XUI/XUI_Ctrl_SplashPulser.h
+++ b/Minecraft.Client/Platform/Common/XUI/XUI_Ctrl_SplashPulser.h
@@ -27,10 +27,10 @@ protected:
 	HRESULT OnRender(XUIMessageRender *pRenderData, BOOL &rfHandled);
 
 private:
-	BOOL m_bDirty;
+	bool m_bDirty;
 	float m_fScale,m_fAlpha;
 
 	float m_fScreenWidth,m_fScreenHeight;
 	float m_fRawWidth,m_fRawHeight;
 
-};
\ No newline at end of file
+};
diff --git a/Minecraft.Client/Platform/Common/XUI/XUI_CustomMessages.h b/Minecraft.Client/Platform/Common/XUI/XUI_CustomMessages.h
index ae7a0fda3..03116b548 100644
--- a/Minecraft.Client/Platform/Common/XUI/XUI_CustomMessages.h
+++ b/Minecraft.Client/Platform/Common/XUI/XUI_CustomMessages.h
@@ -20,7 +20,7 @@ typedef struct
 	int iDataBitField;
 	int iItemBitField;
 	LPCWSTR szPath;
-	BOOL bDirty;
+	bool bDirty;
 }
 CustomMessage_GetSlotItem_Struct;