diff --git a/src/common/fonts/singlelumpfont.cpp b/src/common/fonts/singlelumpfont.cpp
index d3bee25a3..94cbd18ec 100644
--- a/src/common/fonts/singlelumpfont.cpp
+++ b/src/common/fonts/singlelumpfont.cpp
@@ -41,6 +41,7 @@
 #include "utf8.h"
 #include "fontchars.h"
 #include "texturemanager.h"
+#include "m_swap.h"
 
 #include "fontinternals.h"
 
diff --git a/src/common/models/models_md2.cpp b/src/common/models/models_md2.cpp
index 4f2a12d4e..56ab6274c 100644
--- a/src/common/models/models_md2.cpp
+++ b/src/common/models/models_md2.cpp
@@ -31,6 +31,7 @@
 #include "texturemanager.h"
 #include "modelrenderer.h"
 #include "printf.h"
+#include "m_swap.h"
 
 #ifdef _MSC_VER
 #pragma warning(disable:4244) // warning C4244: conversion from 'double' to 'float', possible loss of data
diff --git a/src/common/models/models_md3.cpp b/src/common/models/models_md3.cpp
index e716a6f26..2337a3897 100644
--- a/src/common/models/models_md3.cpp
+++ b/src/common/models/models_md3.cpp
@@ -25,6 +25,7 @@
 #include "model_md3.h"
 #include "texturemanager.h"
 #include "modelrenderer.h"
+#include "m_swap.h"
 
 #define MAX_QPATH 64
 
diff --git a/src/common/textures/formats/ddstexture.cpp b/src/common/textures/formats/ddstexture.cpp
index 8a3d0ba74..5ccf309b9 100644
--- a/src/common/textures/formats/ddstexture.cpp
+++ b/src/common/textures/formats/ddstexture.cpp
@@ -54,6 +54,7 @@
 #include "bitmap.h"
 #include "imagehelpers.h"
 #include "image.h"
+#include "m_swap.h"
 
 // Since we want this to compile under Linux too, we need to define this
 // stuff ourselves instead of including a DirectX header.
diff --git a/src/common/textures/formats/jpegtexture.cpp b/src/common/textures/formats/jpegtexture.cpp
index b1e5163b3..79ba53671 100644
--- a/src/common/textures/formats/jpegtexture.cpp
+++ b/src/common/textures/formats/jpegtexture.cpp
@@ -46,6 +46,7 @@ extern "C"
 #include "bitmap.h"
 #include "imagehelpers.h"
 #include "image.h"
+#include "m_swap.h"
 
 
 struct FLumpSourceMgr : public jpeg_source_mgr
diff --git a/src/common/textures/formats/patchtexture.cpp b/src/common/textures/formats/patchtexture.cpp
index 2fe36efe7..ecbd09147 100644
--- a/src/common/textures/formats/patchtexture.cpp
+++ b/src/common/textures/formats/patchtexture.cpp
@@ -38,6 +38,7 @@
 #include "bitmap.h"
 #include "image.h"
 #include "imagehelpers.h"
+#include "m_swap.h"
 
 
 // posts are runs of non masked source pixels
diff --git a/src/common/textures/formats/pcxtexture.cpp b/src/common/textures/formats/pcxtexture.cpp
index 60e2f4aba..7e97ba2ef 100644
--- a/src/common/textures/formats/pcxtexture.cpp
+++ b/src/common/textures/formats/pcxtexture.cpp
@@ -39,6 +39,7 @@
 #include "bitmap.h"
 #include "imagehelpers.h"
 #include "image.h"
+#include "m_swap.h"
 
 //==========================================================================
 //
diff --git a/src/common/textures/formats/pngtexture.cpp b/src/common/textures/formats/pngtexture.cpp
index f9e39fc8c..cdf14c15c 100644
--- a/src/common/textures/formats/pngtexture.cpp
+++ b/src/common/textures/formats/pngtexture.cpp
@@ -43,6 +43,7 @@
 #include "printf.h"
 #include "texturemanager.h"
 #include "filesystem.h"
+#include "m_swap.h"
 
 //==========================================================================
 //
diff --git a/src/common/textures/formats/rawpagetexture.cpp b/src/common/textures/formats/rawpagetexture.cpp
index 19d3f4587..09d07d0ce 100644
--- a/src/common/textures/formats/rawpagetexture.cpp
+++ b/src/common/textures/formats/rawpagetexture.cpp
@@ -38,6 +38,7 @@
 #include "bitmap.h"
 #include "imagehelpers.h"
 #include "image.h"
+#include "m_swap.h"
 
 
 //==========================================================================
diff --git a/src/common/textures/formats/tgatexture.cpp b/src/common/textures/formats/tgatexture.cpp
index 932eeeaf1..daa70cfa4 100644
--- a/src/common/textures/formats/tgatexture.cpp
+++ b/src/common/textures/formats/tgatexture.cpp
@@ -39,6 +39,7 @@
 #include "bitmap.h"
 #include "imagehelpers.h"
 #include "image.h"
+#include "m_swap.h"
 
 
 //==========================================================================
diff --git a/src/common/textures/multipatchtexturebuilder.cpp b/src/common/textures/multipatchtexturebuilder.cpp
index 2a8b77fea..201398ee8 100644
--- a/src/common/textures/multipatchtexturebuilder.cpp
+++ b/src/common/textures/multipatchtexturebuilder.cpp
@@ -44,6 +44,7 @@
 #include "image.h"
 #include "formats/multipatchtexture.h"
 #include "texturemanager.h"
+#include "m_swap.h"
 
 
 // On the Alpha, accessing the shorts directly if they aren't aligned on a
diff --git a/src/common/utility/palette.cpp b/src/common/utility/palette.cpp
index e7bc61f09..527d1cd17 100644
--- a/src/common/utility/palette.cpp
+++ b/src/common/utility/palette.cpp
@@ -39,6 +39,7 @@
 #include "files.h"
 #include "filesystem.h"
 #include "printf.h"
+#include "m_swap.h"
 
 #include "m_png.h"
 
diff --git a/src/gamedata/textures/buildloader.cpp b/src/gamedata/textures/buildloader.cpp
index bfcc63225..4bb7b2721 100644
--- a/src/gamedata/textures/buildloader.cpp
+++ b/src/gamedata/textures/buildloader.cpp
@@ -47,6 +47,7 @@
 #include "texturemanager.h"
 #include "r_translate.h"
 #include "r_data/sprites.h"
+#include "m_swap.h"
 
 //===========================================================================
 //