diff --git a/Source/DisplayCluster/DisplayCluster.Build.cs b/Source/DisplayCluster/DisplayCluster.Build.cs
index 4fc4726df0f6ccad000b687b39d7d841fac96d3a..bddd5b50078ddcbccde41aa99a867ed360b35a81 100644
--- a/Source/DisplayCluster/DisplayCluster.Build.cs
+++ b/Source/DisplayCluster/DisplayCluster.Build.cs
@@ -129,12 +129,12 @@ public class DisplayCluster : ModuleRules
 		}
 		else if (ROTargetRules.Platform == UnrealTargetPlatform.Linux)
 		{
-			string LibrariesPath = Path.Combine(ThirdPartyPath, "VRPN", "Lib/Linux");
+			string LibrariesPath = Path.Combine(ThirdPartyPath, "Vrpn", "Lib/Linux");
 			
-			PublicAdditionalLibraries.Add(Path.Combine(LibrariesPath, "libvrpn.lib"));
-			PublicAdditionalLibraries.Add(Path.Combine(LibrariesPath, "libquat.lib"));
+			PublicAdditionalLibraries.Add(Path.Combine(LibrariesPath, "libvrpn.a"));
+			PublicAdditionalLibraries.Add(Path.Combine(LibrariesPath, "libquat.a"));
 			
-			PublicIncludePaths.Add(Path.Combine(ThirdPartyPath, "VRPN", "Include"));
+			PublicIncludePaths.Add(Path.Combine(ThirdPartyPath, "Vrpn", "Include"));
 			PublicIncludePaths.Add(Path.Combine(ThirdPartyPath, "X11", "Include")); // Necessary for hardware swap sync.
 			
 			return true;
diff --git a/ThirdParty/Vrpn/Lib/Linux/libquat.lib b/ThirdParty/Vrpn/Lib/Linux/libquat.a
similarity index 100%
rename from ThirdParty/Vrpn/Lib/Linux/libquat.lib
rename to ThirdParty/Vrpn/Lib/Linux/libquat.a
diff --git a/ThirdParty/Vrpn/Lib/Linux/libvrpn.lib b/ThirdParty/Vrpn/Lib/Linux/libvrpn.a
similarity index 100%
rename from ThirdParty/Vrpn/Lib/Linux/libvrpn.lib
rename to ThirdParty/Vrpn/Lib/Linux/libvrpn.a
diff --git a/ThirdParty/X11/Include/X11/X.h b/ThirdParty/X11/Include/X11/X.h
index 5cf695d7b778ebfe96290b6e6125a9c2c14943ed..99fe0e1e86d00be0d227d7ceeef95274efdc47d3 100644
--- a/ThirdParty/X11/Include/X11/X.h
+++ b/ThirdParty/X11/Include/X11/X.h
@@ -111,10 +111,6 @@ typedef unsigned char KeyCode;
  * RESERVED RESOURCE AND CONSTANT DEFINITIONS
  *****************************************************************/
 
-#ifndef None
-#define None                 0L	/* universal null resource or null atom */
-#endif
-
 #define ParentRelative       1L	/* background pixmap in CreateWindow
 				    and ChangeWindowAttributes */
 
@@ -136,8 +132,6 @@ typedef unsigned char KeyCode;
 
 #define AllTemporary         0L	/* special Resource ID passed to KillClient */
 
-#define CurrentTime          0L	/* special Time */
-
 #define NoSymbol	     0L	/* special KeySym */
 
 /*****************************************************************