diff --git a/Minecraft.Client/Common/Tutorial/AreaConstraint.cpp b/Minecraft.Client/Common/Tutorial/AreaConstraint.cpp
index 59c840299..abfee271b 100644
--- a/Minecraft.Client/Common/Tutorial/AreaConstraint.cpp
+++ b/Minecraft.Client/Common/Tutorial/AreaConstraint.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
 
 #include "../../Minecraft.h"
-#include "../../MultiplayerLocalPlayer.h"
+#include "../../MultiPlayerLocalPlayer.h"
 #include "AreaConstraint.h"
 #include "../../../Minecraft.World/AABB.h"
 
@@ -49,4 +49,4 @@ bool AreaConstraint::canMoveToPosition(double xo, double yo, double zo, double x
 	double currDist = origPos->distanceTo(movementArea);
 	double targetDist = targetPos->distanceTo(movementArea);
 	return targetDist < currDist;
-}
\ No newline at end of file
+}
diff --git a/Minecraft.Client/Common/Tutorial/AreaHint.cpp b/Minecraft.Client/Common/Tutorial/AreaHint.cpp
index 2d001b6d1..67db38afc 100644
--- a/Minecraft.Client/Common/Tutorial/AreaHint.cpp
+++ b/Minecraft.Client/Common/Tutorial/AreaHint.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
 
 #include "../../Minecraft.h"
-#include "../../MultiplayerLocalPlayer.h"
+#include "../../MultiPlayerLocalPlayer.h"
 #include "AreaHint.h"
 #include "../../../Minecraft.World/AABB.h"
 #include "Tutorial.h"
@@ -46,4 +46,4 @@ int AreaHint::tick()
 	{
 		return -1;
 	}
-}
\ No newline at end of file
+}
diff --git a/Minecraft.Client/Common/Tutorial/ChangeStateConstraint.cpp b/Minecraft.Client/Common/Tutorial/ChangeStateConstraint.cpp
index 1439c8d2f..b929435f2 100644
--- a/Minecraft.Client/Common/Tutorial/ChangeStateConstraint.cpp
+++ b/Minecraft.Client/Common/Tutorial/ChangeStateConstraint.cpp
@@ -2,7 +2,7 @@
 
 #include "Tutorial.h"
 #include "../../Minecraft.h"
-#include "../../MultiplayerLocalPlayer.h"
+#include "../../MultiPlayerLocalPlayer.h"
 #include "../../../Minecraft.World/net.minecraft.world.level.h"
 #include "ChangeStateConstraint.h"
 #include "../../../Minecraft.World/AABB.h"
@@ -133,4 +133,4 @@ void ChangeStateConstraint::tick(int iPad)
 			}
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/Minecraft.Client/Common/Tutorial/ChoiceTask.cpp b/Minecraft.Client/Common/Tutorial/ChoiceTask.cpp
index 2be9e9566..d3c794f2c 100644
--- a/Minecraft.Client/Common/Tutorial/ChoiceTask.cpp
+++ b/Minecraft.Client/Common/Tutorial/ChoiceTask.cpp
@@ -2,7 +2,7 @@
 #include <string>
 #include <unordered_map>
 #include "../../Minecraft.h"
-#include "../../MultiplayerLocalPlayer.h"
+#include "../../MultiPlayerLocalPlayer.h"
 #include "Tutorial.h"
 #include "TutorialConstraints.h"
 #include "ChoiceTask.h"
diff --git a/Minecraft.Client/Common/Tutorial/ControllerTask.cpp b/Minecraft.Client/Common/Tutorial/ControllerTask.cpp
index f2c35a896..790626c1f 100644
--- a/Minecraft.Client/Common/Tutorial/ControllerTask.cpp
+++ b/Minecraft.Client/Common/Tutorial/ControllerTask.cpp
@@ -2,7 +2,7 @@
 #include <string>
 #include <unordered_map>
 #include "../../Minecraft.h"
-#include "../../MultiplayerLocalPlayer.h"
+#include "../../MultiPlayerLocalPlayer.h"
 #include "Tutorial.h"
 #include "TutorialConstraints.h"
 #include "ControllerTask.h"
@@ -120,4 +120,4 @@ void ControllerTask::setAsCurrentTask(bool active /*= true*/)
 {
 	TutorialTask::setAsCurrentTask(active);
 	enableConstraints(!active);
-}
\ No newline at end of file
+}
diff --git a/Minecraft.Client/Common/Tutorial/InfoTask.cpp b/Minecraft.Client/Common/Tutorial/InfoTask.cpp
index 5967f7cb5..9c93c6156 100644
--- a/Minecraft.Client/Common/Tutorial/InfoTask.cpp
+++ b/Minecraft.Client/Common/Tutorial/InfoTask.cpp
@@ -2,7 +2,7 @@
 #include <string>
 #include <unordered_map>
 #include "../../Minecraft.h"
-#include "../../MultiplayerLocalPlayer.h"
+#include "../../MultiPlayerLocalPlayer.h"
 #include "Tutorial.h"
 #include "TutorialConstraints.h"
 #include "InfoTask.h"
diff --git a/Minecraft.Client/Common/Tutorial/TutorialHint.cpp b/Minecraft.Client/Common/Tutorial/TutorialHint.cpp
index 8295ee71a..a9a4be09a 100644
--- a/Minecraft.Client/Common/Tutorial/TutorialHint.cpp
+++ b/Minecraft.Client/Common/Tutorial/TutorialHint.cpp
@@ -5,7 +5,7 @@
 #include "Tutorial.h"
 #include "TutorialHint.h"
 #include "../../Minecraft.h"
-#include "../../MultiplayerLocalPlayer.h"
+#include "../../MultiPlayerLocalPlayer.h"
 
 TutorialHint::TutorialHint(eTutorial_Hint id, Tutorial *tutorial, int descriptionId, eHintType type, bool allowFade /*= true*/) 
 	: m_id( id ), m_tutorial(tutorial), m_descriptionId( descriptionId ), m_type( type ), m_counter( 0 ),
@@ -125,4 +125,4 @@ int TutorialHint::tick()
 		break;
 	}
 	return returnVal;
-}
\ No newline at end of file
+}
diff --git a/Minecraft.Client/Common/Tutorial/TutorialMode.cpp b/Minecraft.Client/Common/Tutorial/TutorialMode.cpp
index e89e991d4..f771a7b8a 100644
--- a/Minecraft.Client/Common/Tutorial/TutorialMode.cpp
+++ b/Minecraft.Client/Common/Tutorial/TutorialMode.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
 #include <memory>
 #include "../../Minecraft.h"
-#include "../../MultiplayerLocalPlayer.h"
+#include "../../MultiPlayerLocalPlayer.h"
 #include "../../MultiPlayerLevel.h"
 #include "../../../Minecraft.World/Inventory.h"
 #include "../../../Minecraft.World/net.minecraft.world.item.h"
@@ -121,4 +121,4 @@ void TutorialMode::attack(shared_ptr<Player> player, shared_ptr<Entity> entity)
 bool TutorialMode::isInputAllowed(int mapping)
 {
 	return tutorial->m_allTutorialsComplete || tutorial->isInputAllowed( mapping );
-}
\ No newline at end of file
+}
diff --git a/Minecraft.Client/Common/UI/IUIScene_AbstractContainerMenu.cpp b/Minecraft.Client/Common/UI/IUIScene_AbstractContainerMenu.cpp
index adc7d3eb7..5e81ab11d 100644
--- a/Minecraft.Client/Common/UI/IUIScene_AbstractContainerMenu.cpp
+++ b/Minecraft.Client/Common/UI/IUIScene_AbstractContainerMenu.cpp
@@ -6,13 +6,15 @@
 #include "../../../Minecraft.World/net.minecraft.world.item.h"
 #include "../../../Minecraft.World/net.minecraft.world.item.crafting.h"
 #include "../../../Minecraft.World/net.minecraft.world.level.tile.entity.h"
-#include "../../MultiplayerLocalPlayer.h"
+#include "../../MultiPlayerLocalPlayer.h"
 #include "../../Minecraft.h"
 
 #ifdef __ORBIS__
 #include <pad.h>
 #endif
-
+#ifdef __linux__
+#include <math.h>
+#endif
 IUIScene_AbstractContainerMenu::IUIScene_AbstractContainerMenu()
 {
 	m_menu = NULL;
diff --git a/Minecraft.Client/Common/UI/IUIScene_CreativeMenu.cpp b/Minecraft.Client/Common/UI/IUIScene_CreativeMenu.cpp
index d95038ea3..a27e27fec 100644
--- a/Minecraft.Client/Common/UI/IUIScene_CreativeMenu.cpp
+++ b/Minecraft.Client/Common/UI/IUIScene_CreativeMenu.cpp
@@ -2,7 +2,7 @@
 #include "IUIScene_CreativeMenu.h"
 
 #include "../../Minecraft.h"
-#include "../../MultiplayerLocalPlayer.h"
+#include "../../MultiPlayerLocalPlayer.h"
 #include "../../../Minecraft.World/net.minecraft.world.inventory.h"
 #include "../../../Minecraft.World/net.minecraft.world.level.tile.h"
 #include "../../../Minecraft.World/net.minecraft.world.level.tile.entity.h"
diff --git a/Minecraft.Client/Common/UI/IUIScene_EnchantingMenu.cpp b/Minecraft.Client/Common/UI/IUIScene_EnchantingMenu.cpp
index 4f4659cf9..6d5278919 100644
--- a/Minecraft.Client/Common/UI/IUIScene_EnchantingMenu.cpp
+++ b/Minecraft.Client/Common/UI/IUIScene_EnchantingMenu.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
 #include "../../../Minecraft.World/net.minecraft.world.inventory.h"
 #include "../../Minecraft.h"
-#include "../../MultiplayerLocalPlayer.h"
+#include "../../MultiPlayerLocalPlayer.h"
 #include "IUIScene_EnchantingMenu.h"
 
 IUIScene_AbstractContainerMenu::ESceneSection IUIScene_EnchantingMenu::GetSectionAndSlotInDirection( IUIScene_AbstractContainerMenu::ESceneSection eSection, ETapState eTapDirection, int *piTargetX, int *piTargetY )
@@ -182,4 +182,4 @@ bool IUIScene_EnchantingMenu::IsSectionSlotList( ESceneSection eSection )
 EnchantmentMenu *IUIScene_EnchantingMenu::getMenu()
 {
 	return (EnchantmentMenu *)m_menu;
-}
\ No newline at end of file
+}
diff --git a/Minecraft.Client/Linux/LinuxStubs.h b/Minecraft.Client/Linux/LinuxStubs.h
index 2d01dd194..910dd9830 100644
--- a/Minecraft.Client/Linux/LinuxStubs.h
+++ b/Minecraft.Client/Linux/LinuxStubs.h
@@ -697,7 +697,7 @@ HANDLE CreateEvent(int manual_reset, int initial_state) {
     return (HANDLE)ev;
 }
 
-typedef bool rrbool;
+//typedef bool rrbool;
 
 #define S_OK 0