diff --git a/Minecraft.Client/Common/Audio/SoundEngine.h b/Minecraft.Client/Common/Audio/SoundEngine.h
index d5f7eeccf..3e9059dad 100644
--- a/Minecraft.Client/Common/Audio/SoundEngine.h
+++ b/Minecraft.Client/Common/Audio/SoundEngine.h
@@ -2,7 +2,7 @@
 class Mob;
 class Options;
 using namespace std;
-#include "../../Minecraft.World/SoundTypes.h"
+#include "../../../Minecraft.World/SoundTypes.h"
 
 enum eMUSICFILES
 {
diff --git a/Minecraft.Client/Linux/LinuxStubs.h b/Minecraft.Client/Linux/LinuxStubs.h
index 997d53914..9e40945f1 100644
--- a/Minecraft.Client/Linux/LinuxStubs.h
+++ b/Minecraft.Client/Linux/LinuxStubs.h
@@ -27,6 +27,8 @@
 #define ZeroMemory RtlZeroMemory
 #define WINAPI
 
+#define _vsnprintf_s vsnprintf;
+
 typedef unsigned int DWORD;
 typedef const char *LPCSTR;
 typedef bool BOOL;
@@ -65,6 +67,7 @@ typedef std::wstring LPWSTR;
 typedef unsigned char boolean; // java brainrot
 #define __debugbreak()
 #define __int32 int
+#define CONST const
 typedef int64_t __int64;
 typedef uint64_t __uint64;
 typedef unsigned long ULONG;
diff --git a/Minecraft.Client/PSVita/Social/SocialManager.h b/Minecraft.Client/PSVita/Social/SocialManager.h
index 0b6f2b2d9..3f111a442 100644
--- a/Minecraft.Client/PSVita/Social/SocialManager.h
+++ b/Minecraft.Client/PSVita/Social/SocialManager.h
@@ -7,7 +7,11 @@
 #ifndef _SOCIAL_MANAGER_H
 #define _SOCIAL_MANAGER_H
 
+#ifndef __linux__
 #include <xsocialpost.h>
+#endif // __linux__#ifndef __linux__
+#include <xsocialpost.h>
+#endif // __linux__
 
 #define MAX_SOCIALPOST_CAPTION	60
 #define MAX_SOCIALPOST_DESC		100
diff --git a/Minecraft.Client/Windows64/Iggy/include/iggy.h b/Minecraft.Client/Windows64/Iggy/include/iggy.h
index 56638a321..d38ccae67 100644
--- a/Minecraft.Client/Windows64/Iggy/include/iggy.h
+++ b/Minecraft.Client/Windows64/Iggy/include/iggy.h
@@ -8,7 +8,7 @@
 #define IggyVersion "1.2.30"
 #define IggyFlashVersion "9,1,2,30"
 
-#include "rrcore.h"   // base data types, macros
+#include "rrCore.h"   // base data types, macros
 
 RADDEFSTART
 
diff --git a/Minecraft.Client/Windows64/Social/SocialManager.h b/Minecraft.Client/Windows64/Social/SocialManager.h
index 0b6f2b2d9..cad278fe3 100644
--- a/Minecraft.Client/Windows64/Social/SocialManager.h
+++ b/Minecraft.Client/Windows64/Social/SocialManager.h
@@ -7,7 +7,9 @@
 #ifndef _SOCIAL_MANAGER_H
 #define _SOCIAL_MANAGER_H
 
+#ifndef __linux__
 #include <xsocialpost.h>
+#endif // __linux__
 
 #define MAX_SOCIALPOST_CAPTION	60
 #define MAX_SOCIALPOST_DESC		100
diff --git a/Minecraft.Client/stdafx.h b/Minecraft.Client/stdafx.h
index 140d27f0b..2de47ad20 100644
--- a/Minecraft.Client/stdafx.h
+++ b/Minecraft.Client/stdafx.h
@@ -295,18 +295,19 @@ typedef XUID GameSessionUID;
 	#include "Windows64/Iggy/gdraw/gdraw_d3d11.h"
 	#include "Windows64/Windows64_UIController.h"
 #elif defined __linux__
-	// #include "Windows64/Sentient/MinecraftTelemetry.h"
+	// FIXME: Make Linux/ versions of all of these
+	// #include "Windows64/Sentient/MinecraftTelemetry.h" // conflicts with Common/Telemetry/TelemetryManager.h, no idea whats up with that
 	#include "Windows64Media/strings.h"
-	// #include "Windows64/Windows64_App.h"
-	// #include "Windows64/Sentient/DynamicConfigurations.h"
-	#include "Windows64/Sentient/SentientTelemetryCommon.h" // not platform-specific so we can steal win64's homework here for now.
-	// #include "Windows64/GameConfig/Minecraft.spa.h"
-	// #include "Windows64/XML/ATGXmlParser.h"	
-	// #include "Windows64/Social/SocialManager.h"
-	// #include "Common/Audio/SoundEngine.h"
-	// #include "Windows64/Iggy/include/iggy.h"
-	// #include "Windows64/Iggy/gdraw/gdraw_d3d11.h"
-	// #include "Windows64/Windows64_UIController.h"
+	#include "Windows64/Windows64_App.h"
+	#include "Windows64/Sentient/DynamicConfigurations.h"
+	#include "Windows64/Sentient/SentientTelemetryCommon.h"
+	#include "Windows64/GameConfig/Minecraft.spa.h"
+	#include "Windows64/XML/ATGXmlParser.h"	
+	#include "Windows64/Social/SocialManager.h"
+	#include "Common/Audio/SoundEngine.h"
+	#include "Windows64/Iggy/include/iggy.h"
+	#include "Windows64/Iggy/gdraw/gdraw_d3d11.h"
+	#include "Windows64/Windows64_UIController.h"
 #elif defined __PSVITA__
 	#include "PSVita/PSVita_App.h"
 	#include "PSVitaMedia/strings.h"		// TODO - create PSVita-specific version of this
diff --git a/Minecraft.World/GameEventPacket.cpp b/Minecraft.World/GameEventPacket.cpp
index 64b36ff41..34e0b2bf1 100644
--- a/Minecraft.World/GameEventPacket.cpp
+++ b/Minecraft.World/GameEventPacket.cpp
@@ -3,7 +3,6 @@
 #include "InputOutputStream.h"
 #include "PacketListener.h"
 #include "GameEventPacket.h"
-#include "../Minecraft.Client/PS3Media/strings.h"
 
 
 const int GameEventPacket::NO_RESPAWN_BED_AVAILABLE = 0;
diff --git a/Minecraft.World/SparseDataStorage.h b/Minecraft.World/SparseDataStorage.h
index 93d5c4244..192316447 100644
--- a/Minecraft.World/SparseDataStorage.h
+++ b/Minecraft.World/SparseDataStorage.h
@@ -1,5 +1,7 @@
 #pragma once
+#ifndef __linux__
 #include "xmcore.h"
+#endif // __linux__
 
 // 4J added - Storage for data (ie the extra per tile storage). Data is normally stored as 4-bits per tile, in a DataLayer class of 16384 bytes ( 128 x 16 x 16 x 0.5 )
 // This class provides more economical storage for such data by taking into consideration that it is quite common for large parts of the data to be very compressible (ie zero).