diff --git a/src/common/engine/stats.h b/src/common/engine/stats.h
index 9ce5268a3..3e048ac16 100644
--- a/src/common/engine/stats.h
+++ b/src/common/engine/stats.h
@@ -97,9 +97,6 @@ private:
 #else
 
 // Windows and macOS
-#ifndef _M_ARM
-#include "x86.h"
-#endif
 
 extern double PerfToSec, PerfToMillisec;
 
diff --git a/src/common/platform/posix/i_system_posix.cpp b/src/common/platform/posix/i_system_posix.cpp
index aa8bea6d2..f9e35b175 100644
--- a/src/common/platform/posix/i_system_posix.cpp
+++ b/src/common/platform/posix/i_system_posix.cpp
@@ -37,7 +37,6 @@
 #include "cmdlib.h"
 #include "i_system.h"
 #include "gameconfigfile.h"
-#include "x86.h"
 
 
 bool I_WriteIniFailed()
diff --git a/src/common/platform/posix/sdl/i_system.cpp b/src/common/platform/posix/sdl/i_system.cpp
index b8fefa3c3..1dc656a69 100644
--- a/src/common/platform/posix/sdl/i_system.cpp
+++ b/src/common/platform/posix/sdl/i_system.cpp
@@ -48,7 +48,6 @@
 #include <sys/ioctl.h>
 
 #include <SDL.h>
-#include "x86.h"
 
 #include "version.h"
 #include "cmdlib.h"
diff --git a/src/common/platform/win32/win32basevideo.cpp b/src/common/platform/win32/win32basevideo.cpp
index de149ae9b..d406a5d43 100644
--- a/src/common/platform/win32/win32basevideo.cpp
+++ b/src/common/platform/win32/win32basevideo.cpp
@@ -35,7 +35,6 @@
 #include <windows.h>
 
 #include "hardware.h"
-#include "x86.h"
 #include "templates.h"
 #include "version.h"
 #include "c_console.h"
diff --git a/src/common/platform/win32/win32glvideo.cpp b/src/common/platform/win32/win32glvideo.cpp
index e6d38d9d6..e41d29b39 100644
--- a/src/common/platform/win32/win32glvideo.cpp
+++ b/src/common/platform/win32/win32glvideo.cpp
@@ -40,7 +40,6 @@
 
 #include "gl_sysfb.h"
 #include "hardware.h"
-#include "x86.h"
 #include "templates.h"
 #include "version.h"
 #include "c_console.h"
diff --git a/src/common/rendering/hwrenderer/data/hw_clock.h b/src/common/rendering/hwrenderer/data/hw_clock.h
index 8dec4a6de..b2d9320b8 100644
--- a/src/common/rendering/hwrenderer/data/hw_clock.h
+++ b/src/common/rendering/hwrenderer/data/hw_clock.h
@@ -2,7 +2,6 @@
 #define __GL_CLOCK_H
 
 #include "stats.h"
-#include "x86.h"
 #include "m_fixed.h"
 
 extern glcycle_t RenderWall,SetupWall,ClipWall;
diff --git a/src/common/rendering/polyrenderer/drawers/poly_thread.cpp b/src/common/rendering/polyrenderer/drawers/poly_thread.cpp
index 809ebca49..96dfc0ce2 100644
--- a/src/common/rendering/polyrenderer/drawers/poly_thread.cpp
+++ b/src/common/rendering/polyrenderer/drawers/poly_thread.cpp
@@ -28,7 +28,6 @@
 #include "model.h"
 #include "poly_thread.h"
 #include "screen_triangle.h"
-#include "x86.h"
 
 #ifndef NO_SSE
 #include <immintrin.h>
diff --git a/src/common/rendering/polyrenderer/drawers/poly_triangle.cpp b/src/common/rendering/polyrenderer/drawers/poly_triangle.cpp
index 772c7ad7c..3e5b17618 100644
--- a/src/common/rendering/polyrenderer/drawers/poly_triangle.cpp
+++ b/src/common/rendering/polyrenderer/drawers/poly_triangle.cpp
@@ -29,7 +29,6 @@
 #include "poly_triangle.h"
 #include "poly_thread.h"
 #include "screen_triangle.h"
-#include "x86.h"
 
 /////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/common/rendering/polyrenderer/drawers/screen_scanline_setup.cpp b/src/common/rendering/polyrenderer/drawers/screen_scanline_setup.cpp
index 4b4ca47e8..57cb3ed90 100644
--- a/src/common/rendering/polyrenderer/drawers/screen_scanline_setup.cpp
+++ b/src/common/rendering/polyrenderer/drawers/screen_scanline_setup.cpp
@@ -24,7 +24,6 @@
 #include "templates.h"
 #include "poly_thread.h"
 #include "screen_scanline_setup.h"
-#include "x86.h"
 #include <cmath>
 
 #ifndef NO_SSE
diff --git a/src/common/rendering/polyrenderer/drawers/screen_shader.cpp b/src/common/rendering/polyrenderer/drawers/screen_shader.cpp
index c4ceb0219..285c97670 100644
--- a/src/common/rendering/polyrenderer/drawers/screen_shader.cpp
+++ b/src/common/rendering/polyrenderer/drawers/screen_shader.cpp
@@ -24,7 +24,6 @@
 #include "templates.h"
 #include "poly_thread.h"
 #include "screen_scanline_setup.h"
-#include "x86.h"
 #include <cmath>
 
 static uint32_t SampleTexture(uint32_t u, uint32_t v, const void* texPixels, int texWidth, int texHeight, bool texBgra)
diff --git a/src/common/rendering/polyrenderer/drawers/screen_triangle.cpp b/src/common/rendering/polyrenderer/drawers/screen_triangle.cpp
index 717f260a0..d7c80442e 100644
--- a/src/common/rendering/polyrenderer/drawers/screen_triangle.cpp
+++ b/src/common/rendering/polyrenderer/drawers/screen_triangle.cpp
@@ -30,7 +30,6 @@
 #include "screen_blend.h"
 #include "screen_scanline_setup.h"
 #include "screen_shader.h"
-#include "x86.h"
 #include <cmath>
 
 static void WriteDepth(int y, int x0, int x1, PolyTriangleThreadData* thread)
diff --git a/src/r_data/v_palette.cpp b/src/r_data/v_palette.cpp
index 795580be6..a78184f7e 100644
--- a/src/r_data/v_palette.cpp
+++ b/src/r_data/v_palette.cpp
@@ -40,7 +40,6 @@
 #include "i_video.h"
 #include "c_dispatch.h"
 #include "st_stuff.h"
-#include "x86.h"
 #include "g_levellocals.h"
 #include "m_png.h"
 #include "v_colortables.h"
diff --git a/src/rendering/swrenderer/drawers/r_draw_rgba.cpp b/src/rendering/swrenderer/drawers/r_draw_rgba.cpp
index 09fdd7326..10bb6be63 100644
--- a/src/rendering/swrenderer/drawers/r_draw_rgba.cpp
+++ b/src/rendering/swrenderer/drawers/r_draw_rgba.cpp
@@ -63,7 +63,6 @@
 
 #include "gi.h"
 #include "stats.h"
-#include "x86.h"
 #include <vector>
 
 ;