diff --git a/Demos3/GpuDemos/premake4.lua b/Demos3/GpuDemos/premake4.lua
index 6de575caf..4434af248 100644
--- a/Demos3/GpuDemos/premake4.lua
+++ b/Demos3/GpuDemos/premake4.lua
@@ -74,6 +74,7 @@ function createProject(vendor)
 			}
 		end
 		if os.is("Linux") then
+			links{"X11"}
 			files {
 				"../../btgui/OpenGLWindow/X11OpenGLWindow.cpp",
 				"../../btgui/OpenGLWindow/X11OpenGLWindows.h"
diff --git a/Demos3/GpuGuiInitialize/premake4.lua b/Demos3/GpuGuiInitialize/premake4.lua
index 33cee5708..696235966 100644
--- a/Demos3/GpuGuiInitialize/premake4.lua
+++ b/Demos3/GpuGuiInitialize/premake4.lua
@@ -68,6 +68,7 @@ function createProject(vendor)
 			}
 		end
 		if os.is("Linux") then
+			links {"X11"}
 			files {
 				"../../btgui/OpenGLWindow/X11OpenGLWindow.cpp",
 				"../../btgui/OpenGLWindow/X11OpenGLWindows.h"
diff --git a/btgui/GwenOpenGLTest/premake4.lua b/btgui/GwenOpenGLTest/premake4.lua
index 27e027a2f..5c28f672c 100644
--- a/btgui/GwenOpenGLTest/premake4.lua
+++ b/btgui/GwenOpenGLTest/premake4.lua
@@ -56,6 +56,7 @@
 	}
 	end
 	if os.is("Linux") then 
+		links ("X11")
 		files{
 		"../OpenGLWindow/X11OpenGLWindow.h",
 		"../OpenGLWindow/X11OpenGLWindow.cpp"
diff --git a/btgui/OpenGLTrueTypeFont/premake4.lua b/btgui/OpenGLTrueTypeFont/premake4.lua
index 76dc31007..967c5c940 100644
--- a/btgui/OpenGLTrueTypeFont/premake4.lua
+++ b/btgui/OpenGLTrueTypeFont/premake4.lua
@@ -46,6 +46,7 @@
 			}
 		end
 		if os.is("Linux") then 
+			links{"X11"}
 			files{
 				"../OpenGLWindow/X11OpenGLWindow.h",
 				"../OpenGLWindow/X11OpenGLWindow.cpp"
diff --git a/src/Bullet3Collision/NarrowPhaseCollision/b3RigidBodyCL.h b/src/Bullet3Collision/NarrowPhaseCollision/b3RigidBodyCL.h
index 28d5ab4f4..be1e5c1a1 100644
--- a/src/Bullet3Collision/NarrowPhaseCollision/b3RigidBodyCL.h
+++ b/src/Bullet3Collision/NarrowPhaseCollision/b3RigidBodyCL.h
@@ -18,7 +18,7 @@ subject to the following restrictions:
 
 #include "Bullet3Common/b3Scalar.h"
 #include "Bullet3Common/b3Matrix3x3.h"
-#include "Bullet3Collision/NarrowPhaseCollision/Shared/b3RigidBodyData.h"
+#include "Bullet3Collision/NarrowPhaseCollision/shared/b3RigidBodyData.h"
 
 
 B3_ATTRIBUTE_ALIGNED16(struct) b3RigidBodyCL : public b3RigidBodyData
diff --git a/src/Bullet3Common/b3Vector3.h b/src/Bullet3Common/b3Vector3.h
index 806335248..5e93b1232 100644
--- a/src/Bullet3Common/b3Vector3.h
+++ b/src/Bullet3Common/b3Vector3.h
@@ -75,10 +75,15 @@ const int32x4_t B3_ATTRIBUTE_ALIGNED16(b3v3AbsMask) = (int32x4_t){0x7FFFFFFF, 0x
 
 class b3Vector3;
 class b3Vector4;
-inline b3Vector3 b3MakeVector3( b3SimdFloat4 v);
+
+#if defined(B3_USE_SSE_IN_API) && defined (B3_USE_SSE)
+//#if defined (B3_USE_SSE) || defined (B3_USE_NEON)
+inline b3Vector3 b3MakeVector3( b3SimdFloat3 v);
+inline b3Vector4 b3MakeVector4(b3SimdFloat4 vec);
+#endif
+
 inline b3Vector3 b3MakeVector3(b3Scalar x,b3Scalar y,b3Scalar z);
 inline b3Vector3 b3MakeVector3(b3Scalar x,b3Scalar y,b3Scalar z, b3Scalar w);
-inline b3Vector4 b3MakeVector4(b3SimdFloat4 vec);
 inline b3Vector4 b3MakeVector4(b3Scalar x,b3Scalar y,b3Scalar z,b3Scalar w);
 
 
@@ -1289,12 +1294,6 @@ B3_FORCE_INLINE void	b3Vector3::deSerialize(const struct	b3Vector3Data& dataIn)
 }
 
 
-inline b3Vector3 b3MakeVector3( b3SimdFloat4 v)
-{
-	b3Vector3 tmp;
-	tmp.set128(v);
-	return tmp;
-}
 		
 
 inline b3Vector3 b3MakeVector3(b3Scalar x,b3Scalar y,b3Scalar z)
@@ -1320,6 +1319,14 @@ inline b3Vector4 b3MakeVector4(b3Scalar x,b3Scalar y,b3Scalar z,b3Scalar w)
 }
 
 #if defined(B3_USE_SSE_IN_API) && defined (B3_USE_SSE) 
+
+inline b3Vector3 b3MakeVector3( b3SimdFloat4 v)
+{
+        b3Vector3 tmp;
+        tmp.set128(v);
+        return tmp;
+}
+
 inline b3Vector4 b3MakeVector4(b3SimdFloat4 vec)
 {
 	b3Vector4	tmp;