diff --git a/src/gl/scene/gl_wall.h b/src/gl/scene/gl_wall.h
index 33a5c72a69..508d07bfb9 100644
--- a/src/gl/scene/gl_wall.h
+++ b/src/gl/scene/gl_wall.h
@@ -9,6 +9,9 @@
 #include "r_data/renderstyle.h"
 #include "textures/textures.h"
 #include "gl/renderer/gl_colormap.h"
+#if defined(__amd64__) || defined(_M_X64)
+#include <xmmintrin.h>
+#endif // x64
 
 struct GLHorizonInfo;
 struct F3DFloor;
@@ -69,10 +72,11 @@ struct GLSeg
 		float x = y2 - y1;
 		float y = x1 - x2;
 #if defined(__amd64__) || defined(_M_X64)
-		__m128 v; 
-		v.m128_f32[0] = x*x + y*y;
-		float ilength = _mm_rsqrt_ss(v).m128_f32[0];
-		return FVector3(x * ilength, 0, y * ilength);
+        __m128 v = _mm_set_ss(x*x + y*y);
+        v = _mm_rsqrt_ss(v);
+        float ilength;
+        _mm_store_ss(&ilength, v);
+        return FVector3(x * ilength, 0, y * ilength);
 #else
 		float length = sqrtf(x*x + y*y);
 		return FVector3(x / length, 0, y / length);
diff --git a/src/vectors.h b/src/vectors.h
index d0d9e5c0be..7df929944a 100644
--- a/src/vectors.h
+++ b/src/vectors.h
@@ -41,7 +41,7 @@
 #define VECTORS_H
 
 #include <math.h>
-#include <limits.h>
+#include <float.h>
 #include <string.h>
 #include "xs_Float.h"
 #include "math/cmath.h"