diff --git a/source/common/2d/v_2ddrawer.cpp b/source/common/2d/v_2ddrawer.cpp
index ddbdba538..182712349 100644
--- a/source/common/2d/v_2ddrawer.cpp
+++ b/source/common/2d/v_2ddrawer.cpp
@@ -33,7 +33,7 @@
 */
 
 #include <stdarg.h>
-#include "templates.h"
+
 #include "v_2ddrawer.h"
 #include "vectors.h"
 #include "vm.h"
diff --git a/source/common/2d/v_draw.cpp b/source/common/2d/v_draw.cpp
index b35e7723a..4a99b8cac 100644
--- a/source/common/2d/v_draw.cpp
+++ b/source/common/2d/v_draw.cpp
@@ -36,7 +36,7 @@
 #include <stdarg.h>
 #include "v_draw.h"
 #include "vm.h"
-#include "templates.h"
+
 #include "texturemanager.h"
 #include "r_videoscale.h"
 #include "c_cvars.h"
diff --git a/source/common/audio/music/i_music.cpp b/source/common/audio/music/i_music.cpp
index b73c630ca..26989992d 100644
--- a/source/common/audio/music/i_music.cpp
+++ b/source/common/audio/music/i_music.cpp
@@ -43,7 +43,7 @@
 #include "m_argv.h"
 #include "filesystem.h"
 #include "c_dispatch.h"
-#include "templates.h"
+
 #include "stats.h"
 #include "cmdlib.h"
 #include "c_cvars.h"
diff --git a/source/common/audio/sound/oalsound.cpp b/source/common/audio/sound/oalsound.cpp
index 96b01c761..4ef36cb4d 100644
--- a/source/common/audio/sound/oalsound.cpp
+++ b/source/common/audio/sound/oalsound.cpp
@@ -36,7 +36,7 @@
 #include <chrono>
 
 #include "c_cvars.h"
-#include "templates.h"
+
 #include "oalsound.h"
 #include "c_dispatch.h"
 #include "v_text.h"
diff --git a/source/common/audio/sound/s_environment.cpp b/source/common/audio/sound/s_environment.cpp
index d2e52e21a..c5f1a5cf7 100644
--- a/source/common/audio/sound/s_environment.cpp
+++ b/source/common/audio/sound/s_environment.cpp
@@ -34,7 +34,7 @@
 
 #include "s_soundinternal.h"
 #include "sc_man.h"
-#include "templates.h"
+
 #include "cmdlib.h"
 
 
diff --git a/source/common/audio/sound/s_reverbedit.cpp b/source/common/audio/sound/s_reverbedit.cpp
index 25993a400..398d4f2f5 100644
--- a/source/common/audio/sound/s_reverbedit.cpp
+++ b/source/common/audio/sound/s_reverbedit.cpp
@@ -36,7 +36,7 @@
 #include "s_soundinternal.h"
 #include "sc_man.h"
 #include "cmdlib.h"
-#include "templates.h"
+
 #include "filesystem.h"
 #include "i_system.h"
 #include "printf.h"
diff --git a/source/common/audio/sound/s_sound.cpp b/source/common/audio/sound/s_sound.cpp
index 55e281be1..46119a322 100644
--- a/source/common/audio/sound/s_sound.cpp
+++ b/source/common/audio/sound/s_sound.cpp
@@ -36,7 +36,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "templates.h"
+
 #include "s_soundinternal.h"
 #include "m_swap.h"
 #include "superfasthash.h"
diff --git a/source/common/console/c_bind.cpp b/source/common/console/c_bind.cpp
index b390dc122..a83951cca 100644
--- a/source/common/console/c_bind.cpp
+++ b/source/common/console/c_bind.cpp
@@ -41,7 +41,7 @@
 #include "c_dispatch.h"
 #include "configfile.h"
 #include "filesystem.h"
-#include "templates.h"
+
 #include "i_time.h"
 #include "printf.h"
 #include "sc_man.h"
diff --git a/source/common/console/c_buttons.cpp b/source/common/console/c_buttons.cpp
index 0ea14dd46..860824ca5 100644
--- a/source/common/console/c_buttons.cpp
+++ b/source/common/console/c_buttons.cpp
@@ -34,7 +34,7 @@
 */
 
 #include "c_buttons.h"
-#include "templates.h"
+
 #include "c_dispatch.h"
 #include "printf.h"
 #include "cmdlib.h"
diff --git a/source/common/console/c_console.cpp b/source/common/console/c_console.cpp
index 4a3abb172..b40708808 100644
--- a/source/common/console/c_console.cpp
+++ b/source/common/console/c_console.cpp
@@ -34,7 +34,7 @@
 
 #include <string>
 
-#include "templates.h"
+
 #include "version.h"
 #include "c_bind.h"
 #include "c_console.h"
diff --git a/source/common/console/c_dispatch.cpp b/source/common/console/c_dispatch.cpp
index c63449221..004c5be3e 100644
--- a/source/common/console/c_dispatch.cpp
+++ b/source/common/console/c_dispatch.cpp
@@ -39,7 +39,7 @@
 #include <string.h>
 #include <ctype.h>
 
-#include "templates.h"
+
 #include "cmdlib.h"
 #include "c_console.h"
 #include "c_dispatch.h"
diff --git a/source/common/cutscenes/playmve.cpp b/source/common/cutscenes/playmve.cpp
index 242997e26..a24d6292d 100644
--- a/source/common/cutscenes/playmve.cpp
+++ b/source/common/cutscenes/playmve.cpp
@@ -49,7 +49,7 @@
 #include "v_draw.h"
 #include "s_music.h"
 #include "cmdlib.h"
-#include "templates.h"
+
 
 
 
diff --git a/source/common/engine/i_net.cpp b/source/common/engine/i_net.cpp
index 94388656f..64fd4acaf 100644
--- a/source/common/engine/i_net.cpp
+++ b/source/common/engine/i_net.cpp
@@ -75,7 +75,7 @@
 #include "cmdlib.h"
 #include "printf.h"
 #include "i_interface.h"
-#include "templates.h"
+
 
 #include "i_net.h"
 
diff --git a/source/common/engine/palettecontainer.cpp b/source/common/engine/palettecontainer.cpp
index 4793fd67c..73fb2bdb9 100644
--- a/source/common/engine/palettecontainer.cpp
+++ b/source/common/engine/palettecontainer.cpp
@@ -37,7 +37,7 @@
 #include "m_crc32.h"
 #include "printf.h"
 #include "colormatcher.h"
-#include "templates.h"
+
 #include "palettecontainer.h"
 #include "files.h"
 
diff --git a/source/common/engine/sc_man.cpp b/source/common/engine/sc_man.cpp
index f24f25d92..29b0b445b 100644
--- a/source/common/engine/sc_man.cpp
+++ b/source/common/engine/sc_man.cpp
@@ -40,11 +40,11 @@
 #include "engineerrors.h"
 #include "sc_man.h"
 #include "cmdlib.h"
-#include "templates.h"
+
 #include "printf.h"
 #include "name.h"
 #include "v_text.h"
-#include "templates.h"
+
 #include "zstring.h"
 #include "name.h"
 #include <inttypes.h>
diff --git a/source/common/filesystem/file_rff.cpp b/source/common/filesystem/file_rff.cpp
index 61603c800..e8c4fce81 100644
--- a/source/common/filesystem/file_rff.cpp
+++ b/source/common/filesystem/file_rff.cpp
@@ -34,7 +34,7 @@
 */
 
 #include "resourcefile.h"
-#include "templates.h"
+
 #include "printf.h"
 
 //==========================================================================
diff --git a/source/common/filesystem/file_zip.cpp b/source/common/filesystem/file_zip.cpp
index 32a3a7807..812e61783 100644
--- a/source/common/filesystem/file_zip.cpp
+++ b/source/common/filesystem/file_zip.cpp
@@ -36,7 +36,7 @@
 #include <time.h>
 #include "file_zip.h"
 #include "cmdlib.h"
-#include "templates.h"
+
 #include "printf.h"
 #include "w_zip.h"
 
diff --git a/source/common/fonts/font.cpp b/source/common/fonts/font.cpp
index 0e1a2d3fb..9dc4fee33 100644
--- a/source/common/fonts/font.cpp
+++ b/source/common/fonts/font.cpp
@@ -40,7 +40,7 @@
 #include <string.h>
 #include <math.h>
 
-#include "templates.h"
+
 #include "m_swap.h"
 #include "v_font.h"
 #include "printf.h"
diff --git a/source/common/fonts/v_font.cpp b/source/common/fonts/v_font.cpp
index 0042f48c3..a9c6d1cf6 100644
--- a/source/common/fonts/v_font.cpp
+++ b/source/common/fonts/v_font.cpp
@@ -39,7 +39,7 @@
 #include <string.h>
 #include <math.h>
 
-#include "templates.h"
+
 #include "m_swap.h"
 #include "v_font.h"
 #include "filesystem.h"
diff --git a/source/common/menu/menudef.cpp b/source/common/menu/menudef.cpp
index ef3397df0..f22f9f9b7 100644
--- a/source/common/menu/menudef.cpp
+++ b/source/common/menu/menudef.cpp
@@ -50,7 +50,7 @@
 #include "texturemanager.h"
 #include "printf.h"
 #include "i_interface.h"
-#include "templates.h"
+
 
 
 bool CheckSkipGameOptionBlock(FScanner& sc);
diff --git a/source/common/objects/dobjgc.cpp b/source/common/objects/dobjgc.cpp
index 8270286ef..91cfafaef 100644
--- a/source/common/objects/dobjgc.cpp
+++ b/source/common/objects/dobjgc.cpp
@@ -57,7 +57,7 @@
 // HEADER FILES ------------------------------------------------------------
 
 #include "dobject.h"
-#include "templates.h"
+
 #include "c_dispatch.h"
 #include "menu.h"
 #include "stats.h"
diff --git a/source/common/platform/posix/cocoa/i_joystick.cpp b/source/common/platform/posix/cocoa/i_joystick.cpp
index 9a003acac..2bbfedb1d 100644
--- a/source/common/platform/posix/cocoa/i_joystick.cpp
+++ b/source/common/platform/posix/cocoa/i_joystick.cpp
@@ -39,7 +39,7 @@
 #include "i_system.h"
 #include "m_argv.h"
 #include "m_joy.h"
-#include "templates.h"
+
 #include "v_text.h"
 #include "printf.h"
 #include "keydef.h"
diff --git a/source/common/platform/posix/sdl/i_joystick.cpp b/source/common/platform/posix/sdl/i_joystick.cpp
index fe4b25eb6..0fa33ba63 100644
--- a/source/common/platform/posix/sdl/i_joystick.cpp
+++ b/source/common/platform/posix/sdl/i_joystick.cpp
@@ -34,7 +34,7 @@
 
 #include "basics.h"
 #include "cmdlib.h"
-#include "templates.h"
+
 #include "m_joy.h"
 #include "keydef.h"
 
diff --git a/source/common/platform/win32/base_sysfb.cpp b/source/common/platform/win32/base_sysfb.cpp
index 3cb8858a3..9c9bb4a54 100644
--- a/source/common/platform/win32/base_sysfb.cpp
+++ b/source/common/platform/win32/base_sysfb.cpp
@@ -39,7 +39,7 @@
 
 #include "gl_sysfb.h"
 #include "hardware.h"
-#include "templates.h"
+
 #include "version.h"
 #include "c_console.h"
 #include "v_video.h"
diff --git a/source/common/platform/win32/gl_sysfb.cpp b/source/common/platform/win32/gl_sysfb.cpp
index 17822d213..8aa266883 100644
--- a/source/common/platform/win32/gl_sysfb.cpp
+++ b/source/common/platform/win32/gl_sysfb.cpp
@@ -39,7 +39,7 @@
 
 #include "gl_sysfb.h"
 #include "hardware.h"
-#include "templates.h"
+
 #include "version.h"
 #include "c_console.h"
 #include "v_video.h"
diff --git a/source/common/platform/win32/i_dijoy.cpp b/source/common/platform/win32/i_dijoy.cpp
index 79b6fcf8f..e4021cc10 100644
--- a/source/common/platform/win32/i_dijoy.cpp
+++ b/source/common/platform/win32/i_dijoy.cpp
@@ -45,7 +45,7 @@
 
 #include "i_input.h"
 #include "d_eventbase.h"
-#include "templates.h"
+
 #include "gameconfigfile.h"
 #include "cmdlib.h"
 #include "v_text.h"
diff --git a/source/common/platform/win32/i_rawps2.cpp b/source/common/platform/win32/i_rawps2.cpp
index 2a7547f3e..90e575a71 100644
--- a/source/common/platform/win32/i_rawps2.cpp
+++ b/source/common/platform/win32/i_rawps2.cpp
@@ -38,7 +38,7 @@
 
 #include "i_input.h"
 #include "d_eventbase.h"
-#include "templates.h"
+
 #include "gameconfigfile.h"
 #include "m_argv.h"
 #include "cmdlib.h"
diff --git a/source/common/platform/win32/i_system.cpp b/source/common/platform/win32/i_system.cpp
index e67f1c8a5..1de30932d 100644
--- a/source/common/platform/win32/i_system.cpp
+++ b/source/common/platform/win32/i_system.cpp
@@ -73,7 +73,7 @@
 
 #include "i_input.h"
 #include "c_dispatch.h"
-#include "templates.h"
+
 #include "gameconfigfile.h"
 #include "v_font.h"
 #include "i_system.h"
diff --git a/source/common/platform/win32/i_xinput.cpp b/source/common/platform/win32/i_xinput.cpp
index 7085de82f..2e8b79dc3 100644
--- a/source/common/platform/win32/i_xinput.cpp
+++ b/source/common/platform/win32/i_xinput.cpp
@@ -40,7 +40,7 @@
 
 #include "i_input.h"
 #include "d_eventbase.h"
-#include "templates.h"
+
 #include "gameconfigfile.h"
 #include "m_argv.h"
 #include "cmdlib.h"
diff --git a/source/common/platform/win32/st_start.cpp b/source/common/platform/win32/st_start.cpp
index 8e8acaeff..71ff4b1cd 100644
--- a/source/common/platform/win32/st_start.cpp
+++ b/source/common/platform/win32/st_start.cpp
@@ -41,7 +41,7 @@
 
 #include "st_start.h"
 #include "cmdlib.h"
-#include "templates.h"
+
 #include "i_system.h"
 #include "i_input.h"
 #include "hardware.h"
diff --git a/source/common/platform/win32/win32basevideo.cpp b/source/common/platform/win32/win32basevideo.cpp
index fc2ae67c4..b579b21f3 100644
--- a/source/common/platform/win32/win32basevideo.cpp
+++ b/source/common/platform/win32/win32basevideo.cpp
@@ -35,7 +35,7 @@
 #include <windows.h>
 
 #include "hardware.h"
-#include "templates.h"
+
 #include "version.h"
 #include "c_console.h"
 #include "v_video.h"
diff --git a/source/common/platform/win32/win32glvideo.cpp b/source/common/platform/win32/win32glvideo.cpp
index abc9768cc..3508f07da 100644
--- a/source/common/platform/win32/win32glvideo.cpp
+++ b/source/common/platform/win32/win32glvideo.cpp
@@ -40,7 +40,7 @@
 
 #include "gl_sysfb.h"
 #include "hardware.h"
-#include "templates.h"
+
 #include "version.h"
 #include "c_console.h"
 #include "v_video.h"
diff --git a/source/common/rendering/gl/gl_debug.cpp b/source/common/rendering/gl/gl_debug.cpp
index c6c3adbfc..38625e73d 100644
--- a/source/common/rendering/gl/gl_debug.cpp
+++ b/source/common/rendering/gl/gl_debug.cpp
@@ -19,7 +19,7 @@
 **  3. This notice may not be removed or altered from any source distribution.
 */
 
-#include "templates.h"
+
 #include "gl_system.h"
 #include "gl_debug.h"
 #include "stats.h"
diff --git a/source/common/rendering/gl/gl_framebuffer.cpp b/source/common/rendering/gl/gl_framebuffer.cpp
index 668965a11..4e1af90b2 100644
--- a/source/common/rendering/gl/gl_framebuffer.cpp
+++ b/source/common/rendering/gl/gl_framebuffer.cpp
@@ -36,7 +36,7 @@
 #include "gl_system.h"
 #include "v_video.h"
 #include "m_png.h"
-#include "templates.h"
+
 #include "i_time.h"
 
 #include "gl_interface.h"
diff --git a/source/common/rendering/gl/gl_hwtexture.cpp b/source/common/rendering/gl/gl_hwtexture.cpp
index 0043a67b8..a23ef82cc 100644
--- a/source/common/rendering/gl/gl_hwtexture.cpp
+++ b/source/common/rendering/gl/gl_hwtexture.cpp
@@ -34,7 +34,7 @@
 */
 
 #include "gl_system.h"
-#include "templates.h"
+
 #include "c_cvars.h"
 #include "hw_material.h"
 
diff --git a/source/common/rendering/gl/gl_postprocess.cpp b/source/common/rendering/gl/gl_postprocess.cpp
index 949fee4b0..f5ec0bfae 100644
--- a/source/common/rendering/gl/gl_postprocess.cpp
+++ b/source/common/rendering/gl/gl_postprocess.cpp
@@ -33,7 +33,7 @@
 #include "flatvertices.h"
 #include "r_videoscale.h"
 #include "v_video.h"
-#include "templates.h"
+
 #include "hw_vrmodes.h"
 #include "v_draw.h"
 
diff --git a/source/common/rendering/gl/gl_postprocessstate.cpp b/source/common/rendering/gl/gl_postprocessstate.cpp
index 2e6a04f05..e490e8708 100644
--- a/source/common/rendering/gl/gl_postprocessstate.cpp
+++ b/source/common/rendering/gl/gl_postprocessstate.cpp
@@ -19,7 +19,7 @@
 **  3. This notice may not be removed or altered from any source distribution.
 */
 
-#include "templates.h"
+
 #include "gl_system.h"
 #include "gl_interface.h"
 #include "gl_postprocessstate.h"
diff --git a/source/common/rendering/gl/gl_renderbuffers.cpp b/source/common/rendering/gl/gl_renderbuffers.cpp
index 134009fc4..08c3de3c1 100644
--- a/source/common/rendering/gl/gl_renderbuffers.cpp
+++ b/source/common/rendering/gl/gl_renderbuffers.cpp
@@ -30,7 +30,7 @@
 #include "gl_postprocessstate.h"
 #include "gl_shaderprogram.h"
 #include "gl_buffers.h"
-#include "templates.h"
+
 #include <random>
 
 EXTERN_CVAR(Int, gl_debug_level)
diff --git a/source/common/rendering/gl/gl_renderstate.cpp b/source/common/rendering/gl/gl_renderstate.cpp
index c660fb98e..d742f35fd 100644
--- a/source/common/rendering/gl/gl_renderstate.cpp
+++ b/source/common/rendering/gl/gl_renderstate.cpp
@@ -25,7 +25,7 @@
 **
 */
 
-#include "templates.h"
+
 #include "gl_system.h"
 #include "gl_interface.h"
 #include "hw_cvars.h"
diff --git a/source/common/rendering/gl/gl_stereo3d.cpp b/source/common/rendering/gl/gl_stereo3d.cpp
index 35bcf2fa0..5f3f41008 100644
--- a/source/common/rendering/gl/gl_stereo3d.cpp
+++ b/source/common/rendering/gl/gl_stereo3d.cpp
@@ -34,7 +34,7 @@
 #include "gl_framebuffer.h"
 #include "gl_shaderprogram.h"
 #include "gl_buffers.h"
-#include "templates.h"
+
 
 EXTERN_CVAR(Int, vr_mode)
 EXTERN_CVAR(Float, vid_saturation)
diff --git a/source/common/rendering/gles/gles_framebuffer.cpp b/source/common/rendering/gles/gles_framebuffer.cpp
index 80c252b63..3391a6f02 100644
--- a/source/common/rendering/gles/gles_framebuffer.cpp
+++ b/source/common/rendering/gles/gles_framebuffer.cpp
@@ -36,7 +36,7 @@
 #include "gles_system.h"
 #include "v_video.h"
 #include "m_png.h"
-#include "templates.h"
+
 #include "i_time.h"
 
 #include "gles_framebuffer.h"
diff --git a/source/common/rendering/gles/gles_hwtexture.cpp b/source/common/rendering/gles/gles_hwtexture.cpp
index 00370481b..a342f24c2 100644
--- a/source/common/rendering/gles/gles_hwtexture.cpp
+++ b/source/common/rendering/gles/gles_hwtexture.cpp
@@ -34,7 +34,7 @@
 */
 
 #include "gles_system.h"
-#include "templates.h"
+
 #include "c_cvars.h"
 #include "hw_material.h"
 
diff --git a/source/common/rendering/gles/gles_postprocess.cpp b/source/common/rendering/gles/gles_postprocess.cpp
index 0e909da2d..bd78d294c 100644
--- a/source/common/rendering/gles/gles_postprocess.cpp
+++ b/source/common/rendering/gles/gles_postprocess.cpp
@@ -32,7 +32,7 @@
 #include "flatvertices.h"
 #include "r_videoscale.h"
 #include "v_video.h"
-#include "templates.h"
+
 #include "hw_vrmodes.h"
 #include "v_draw.h"
 
diff --git a/source/common/rendering/gles/gles_postprocessstate.cpp b/source/common/rendering/gles/gles_postprocessstate.cpp
index 216406125..ea8921837 100644
--- a/source/common/rendering/gles/gles_postprocessstate.cpp
+++ b/source/common/rendering/gles/gles_postprocessstate.cpp
@@ -19,7 +19,7 @@
 **  3. This notice may not be removed or altered from any source distribution.
 */
 
-#include "templates.h"
+
 #include "gles_system.h"
 #include "gles_postprocessstate.h"
 
diff --git a/source/common/rendering/gles/gles_renderbuffers.cpp b/source/common/rendering/gles/gles_renderbuffers.cpp
index 91f8ce462..1d8147ae1 100644
--- a/source/common/rendering/gles/gles_renderbuffers.cpp
+++ b/source/common/rendering/gles/gles_renderbuffers.cpp
@@ -28,7 +28,7 @@
 #include "gles_postprocessstate.h"
 #include "gles_shaderprogram.h"
 #include "gles_buffers.h"
-#include "templates.h"
+
 #include <random>
 
 EXTERN_CVAR(Int, gl_debug_level)
diff --git a/source/common/rendering/gles/gles_renderstate.cpp b/source/common/rendering/gles/gles_renderstate.cpp
index 0a9e4ca13..961ec8121 100644
--- a/source/common/rendering/gles/gles_renderstate.cpp
+++ b/source/common/rendering/gles/gles_renderstate.cpp
@@ -25,7 +25,7 @@
 **
 */
 
-#include "templates.h"
+
 #include "gles_system.h"
 #include "hw_cvars.h"
 #include "flatvertices.h"
diff --git a/source/common/rendering/hwrenderer/postprocessing/hw_postprocess.cpp b/source/common/rendering/hwrenderer/postprocessing/hw_postprocess.cpp
index 2c6b262ab..5034b7935 100644
--- a/source/common/rendering/hwrenderer/postprocessing/hw_postprocess.cpp
+++ b/source/common/rendering/hwrenderer/postprocessing/hw_postprocess.cpp
@@ -26,7 +26,7 @@
 #include "hwrenderer/postprocessing/hw_postprocessshader.h"
 #include <random>
 #include "texturemanager.h"
-#include "templates.h"
+
 #include "stats.h"
 
 Postprocess hw_postprocess;
diff --git a/source/common/rendering/i_modelvertexbuffer.h b/source/common/rendering/i_modelvertexbuffer.h
index febec3c71..aea703c27 100644
--- a/source/common/rendering/i_modelvertexbuffer.h
+++ b/source/common/rendering/i_modelvertexbuffer.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "templates.h"
+
 
 struct FModelVertex
 {
diff --git a/source/common/rendering/r_thread.cpp b/source/common/rendering/r_thread.cpp
index 0415bd40c..09ecde78b 100644
--- a/source/common/rendering/r_thread.cpp
+++ b/source/common/rendering/r_thread.cpp
@@ -21,7 +21,7 @@
 */
 
 #include <stddef.h>
-#include "templates.h"
+
 #include "i_system.h"
 #include "filesystem.h"
 #include "v_video.h"
diff --git a/source/common/rendering/r_thread.h b/source/common/rendering/r_thread.h
index e5aea8541..f1e49d416 100644
--- a/source/common/rendering/r_thread.h
+++ b/source/common/rendering/r_thread.h
@@ -27,7 +27,7 @@
 #include <thread>
 #include <mutex>
 #include <condition_variable>
-#include "templates.h"
+
 #include "c_cvars.h"
 #include "basics.h"
 
diff --git a/source/common/rendering/r_videoscale.cpp b/source/common/rendering/r_videoscale.cpp
index 265003246..f94621e9d 100644
--- a/source/common/rendering/r_videoscale.cpp
+++ b/source/common/rendering/r_videoscale.cpp
@@ -34,7 +34,7 @@
 #include "c_dispatch.h"
 #include "c_cvars.h"
 #include "v_video.h"
-#include "templates.h"
+
 #include "r_videoscale.h"
 #include "cmdlib.h"
 #include "v_draw.h"
diff --git a/source/common/rendering/v_video.cpp b/source/common/rendering/v_video.cpp
index 2d4e08942..4a8638593 100644
--- a/source/common/rendering/v_video.cpp
+++ b/source/common/rendering/v_video.cpp
@@ -61,7 +61,7 @@
 #include "texturemanager.h"
 #include "i_interface.h"
 #include "v_draw.h"
-#include "templates.h"
+
 
 EXTERN_CVAR(Int, menu_resolution_custom_width)
 EXTERN_CVAR(Int, menu_resolution_custom_height)
diff --git a/source/common/rendering/vulkan/renderer/vk_postprocess.cpp b/source/common/rendering/vulkan/renderer/vk_postprocess.cpp
index 9d1702834..dd8a22e95 100644
--- a/source/common/rendering/vulkan/renderer/vk_postprocess.cpp
+++ b/source/common/rendering/vulkan/renderer/vk_postprocess.cpp
@@ -36,7 +36,7 @@
 #include "flatvertices.h"
 #include "r_videoscale.h"
 #include "filesystem.h"
-#include "templates.h"
+
 
 EXTERN_CVAR(Int, gl_dither_bpc)
 
diff --git a/source/common/rendering/vulkan/renderer/vk_renderbuffers.cpp b/source/common/rendering/vulkan/renderer/vk_renderbuffers.cpp
index 34e44096d..466acd5f4 100644
--- a/source/common/rendering/vulkan/renderer/vk_renderbuffers.cpp
+++ b/source/common/rendering/vulkan/renderer/vk_renderbuffers.cpp
@@ -27,7 +27,7 @@
 #include "vulkan/system/vk_builders.h"
 #include "vulkan/system/vk_framebuffer.h"
 #include "hw_cvars.h"
-#include "templates.h"
+
 
 VkRenderBuffers::VkRenderBuffers()
 {
diff --git a/source/common/rendering/vulkan/renderer/vk_renderstate.cpp b/source/common/rendering/vulkan/renderer/vk_renderstate.cpp
index c5ff77831..95560a870 100644
--- a/source/common/rendering/vulkan/renderer/vk_renderstate.cpp
+++ b/source/common/rendering/vulkan/renderer/vk_renderstate.cpp
@@ -26,7 +26,7 @@
 #include "vulkan/renderer/vk_renderpass.h"
 #include "vulkan/renderer/vk_renderbuffers.h"
 #include "vulkan/textures/vk_hwtexture.h"
-#include "templates.h"
+
 #include "hw_skydome.h"
 #include "hw_viewpointuniforms.h"
 #include "hw_lightbuffer.h"
diff --git a/source/common/rendering/vulkan/system/vk_framebuffer.cpp b/source/common/rendering/vulkan/system/vk_framebuffer.cpp
index 160876da4..e189f4b24 100644
--- a/source/common/rendering/vulkan/system/vk_framebuffer.cpp
+++ b/source/common/rendering/vulkan/system/vk_framebuffer.cpp
@@ -26,7 +26,7 @@
 
 #include "v_video.h"
 #include "m_png.h"
-#include "templates.h"
+
 #include "r_videoscale.h"
 #include "i_time.h"
 #include "v_text.h"
diff --git a/source/common/rendering/vulkan/textures/vk_hwtexture.cpp b/source/common/rendering/vulkan/textures/vk_hwtexture.cpp
index c62a7173e..b3ad6e66b 100644
--- a/source/common/rendering/vulkan/textures/vk_hwtexture.cpp
+++ b/source/common/rendering/vulkan/textures/vk_hwtexture.cpp
@@ -20,7 +20,7 @@
 **
 */
 
-#include "templates.h"
+
 #include "c_cvars.h"
 #include "hw_material.h"
 #include "hw_cvars.h"
diff --git a/source/common/rendering/vulkan/thirdparty/vk_mem_alloc/vk_mem_alloc.h b/source/common/rendering/vulkan/thirdparty/vk_mem_alloc/vk_mem_alloc.h
index d153f5ad2..fd4472286 100644
--- a/source/common/rendering/vulkan/thirdparty/vk_mem_alloc/vk_mem_alloc.h
+++ b/source/common/rendering/vulkan/thirdparty/vk_mem_alloc/vk_mem_alloc.h
@@ -18473,8 +18473,8 @@ VkMemoryRequirements img2MemReq;
 vkGetImageMemoryRequirements(device, img2, &img2MemReq);
 
 VkMemoryRequirements finalMemReq = {};
-finalMemReq.size = max(img1MemReq.size, img2MemReq.size);
-finalMemReq.alignment = max(img1MemReq.alignment, img2MemReq.alignment);
+finalMemReq.size = std::max(img1MemReq.size, img2MemReq.size);
+finalMemReq.alignment = std::max(img1MemReq.alignment, img2MemReq.alignment);
 finalMemReq.memoryTypeBits = img1MemReq.memoryTypeBits & img2MemReq.memoryTypeBits;
 // Validate if(finalMemReq.memoryTypeBits != 0)
 
diff --git a/source/common/scripting/backend/codegen.cpp b/source/common/scripting/backend/codegen.cpp
index 2195d745a..185c79d59 100644
--- a/source/common/scripting/backend/codegen.cpp
+++ b/source/common/scripting/backend/codegen.cpp
@@ -43,7 +43,7 @@
 #include "texturemanager.h"
 #include "m_random.h"
 #include "v_font.h"
-#include "templates.h"
+
 
 extern FRandom pr_exrandom;
 FMemArena FxAlloc(65536);
diff --git a/source/common/scripting/core/symbols.cpp b/source/common/scripting/core/symbols.cpp
index 0540c647c..be0b11e18 100644
--- a/source/common/scripting/core/symbols.cpp
+++ b/source/common/scripting/core/symbols.cpp
@@ -35,7 +35,7 @@
 
 #include <float.h>
 #include "dobject.h"
-#include "templates.h"
+
 #include "serializer.h"
 #include "types.h"
 #include "vm.h"
diff --git a/source/common/scripting/core/vmdisasm.cpp b/source/common/scripting/core/vmdisasm.cpp
index 8fbf0aa8b..0f68b3a1d 100644
--- a/source/common/scripting/core/vmdisasm.cpp
+++ b/source/common/scripting/core/vmdisasm.cpp
@@ -33,7 +33,7 @@
 
 #include "dobject.h"
 #include "c_console.h"
-#include "templates.h"
+
 #include "vmintern.h"
 #include "printf.h"
 
diff --git a/source/common/scripting/frontend/zcc_parser.cpp b/source/common/scripting/frontend/zcc_parser.cpp
index e176c646e..0d1928653 100644
--- a/source/common/scripting/frontend/zcc_parser.cpp
+++ b/source/common/scripting/frontend/zcc_parser.cpp
@@ -40,7 +40,7 @@
 #include "version.h"
 #include "zcc_parser.h"
 #include "zcc_compile.h"
-#include "templates.h"
+
 
 TArray<FString> Includes;
 TArray<FScriptPosition> IncludeLocs;
diff --git a/source/common/scripting/interface/vmnatives.cpp b/source/common/scripting/interface/vmnatives.cpp
index 77cd6b4b1..c326b2e1b 100644
--- a/source/common/scripting/interface/vmnatives.cpp
+++ b/source/common/scripting/interface/vmnatives.cpp
@@ -41,7 +41,7 @@
 #include "c_cvars.h"
 #include "c_bind.h"
 #include "c_dispatch.h"
-#include "templates.h"
+
 #include "menu.h"
 #include "vm.h"
 #include "gstrings.h"
diff --git a/source/common/scripting/vm/vmframe.cpp b/source/common/scripting/vm/vmframe.cpp
index 75dab6305..1fc82549d 100644
--- a/source/common/scripting/vm/vmframe.cpp
+++ b/source/common/scripting/vm/vmframe.cpp
@@ -37,7 +37,7 @@
 #include "v_text.h"
 #include "stats.h"
 #include "c_dispatch.h"
-#include "templates.h"
+
 #include "vmintern.h"
 #include "types.h"
 #include "jit.h"
diff --git a/source/common/statusbar/base_sbar.cpp b/source/common/statusbar/base_sbar.cpp
index 383e8a148..9ea4a6d26 100644
--- a/source/common/statusbar/base_sbar.cpp
+++ b/source/common/statusbar/base_sbar.cpp
@@ -35,7 +35,7 @@
 
 #include <assert.h>
 
-#include "templates.h"
+
 #include "base_sbar.h"
 #include "printf.h"
 #include "v_draw.h"
diff --git a/source/common/textures/animtexture.cpp b/source/common/textures/animtexture.cpp
index 8f8add3f7..039021641 100644
--- a/source/common/textures/animtexture.cpp
+++ b/source/common/textures/animtexture.cpp
@@ -34,7 +34,7 @@
 #include "animtexture.h"
 #include "bitmap.h"
 #include "texturemanager.h"
-#include "templates.h"
+
 
 //==========================================================================
 //
diff --git a/source/common/textures/bitmap.h b/source/common/textures/bitmap.h
index dc2054778..88df40307 100644
--- a/source/common/textures/bitmap.h
+++ b/source/common/textures/bitmap.h
@@ -37,7 +37,7 @@
 #define __BITMAP_H__
 
 #include "basics.h"
-#include "templates.h"
+
 #include "palentry.h"
 
 struct FCopyInfo;
diff --git a/source/common/textures/formats/pngtexture.cpp b/source/common/textures/formats/pngtexture.cpp
index b16057a8d..dd0976a8e 100644
--- a/source/common/textures/formats/pngtexture.cpp
+++ b/source/common/textures/formats/pngtexture.cpp
@@ -35,7 +35,7 @@
 */
 
 #include "files.h"
-#include "templates.h"
+
 #include "m_png.h"
 #include "bitmap.h"
 #include "imagehelpers.h"
diff --git a/source/common/textures/formats/tgatexture.cpp b/source/common/textures/formats/tgatexture.cpp
index 3f6c8b0d7..d2e12e1aa 100644
--- a/source/common/textures/formats/tgatexture.cpp
+++ b/source/common/textures/formats/tgatexture.cpp
@@ -35,7 +35,7 @@
 
 #include "files.h"
 #include "filesystem.h"
-#include "templates.h"
+
 #include "bitmap.h"
 #include "imagehelpers.h"
 #include "image.h"
diff --git a/source/common/textures/gametexture.cpp b/source/common/textures/gametexture.cpp
index 29d1ee2dd..c5979a7a9 100644
--- a/source/common/textures/gametexture.cpp
+++ b/source/common/textures/gametexture.cpp
@@ -37,7 +37,7 @@
 #include "printf.h"
 #include "files.h"
 #include "filesystem.h"
-#include "templates.h"
+
 #include "textures.h"
 #include "bitmap.h"
 #include "colormatcher.h"
diff --git a/source/common/textures/imagetexture.cpp b/source/common/textures/imagetexture.cpp
index 5ec15c7b5..261333c98 100644
--- a/source/common/textures/imagetexture.cpp
+++ b/source/common/textures/imagetexture.cpp
@@ -35,7 +35,7 @@
 
 #include "files.h"
 #include "filesystem.h"
-#include "templates.h"
+
 #include "bitmap.h"
 #include "image.h"
 #include "textures.h"
diff --git a/source/common/textures/texture.cpp b/source/common/textures/texture.cpp
index 6cee890db..5b88c3cef 100644
--- a/source/common/textures/texture.cpp
+++ b/source/common/textures/texture.cpp
@@ -37,7 +37,7 @@
 #include "printf.h"
 #include "files.h"
 #include "filesystem.h"
-#include "templates.h"
+
 #include "textures.h"
 #include "bitmap.h"
 #include "colormatcher.h"
diff --git a/source/common/textures/texturemanager.cpp b/source/common/textures/texturemanager.cpp
index c4fcfd841..65e267b84 100644
--- a/source/common/textures/texturemanager.cpp
+++ b/source/common/textures/texturemanager.cpp
@@ -37,7 +37,7 @@
 #include "filesystem.h"
 #include "printf.h"
 #include "c_cvars.h"
-#include "templates.h"
+
 #include "gstrings.h"
 #include "textures.h"
 #include "texturemanager.h"
diff --git a/source/common/thirdparty/earcut.hpp b/source/common/thirdparty/earcut.hpp
index e6dba7a38..2c83e33bf 100644
--- a/source/common/thirdparty/earcut.hpp
+++ b/source/common/thirdparty/earcut.hpp
@@ -132,7 +132,7 @@ private:
                 alloc_traits::deallocate(alloc, allocation, blockSize);
             }
             allocations.clear();
-            blockSize = max<std::size_t>(1, newBlockSize);
+            blockSize = std::max<std::size_t>(1, newBlockSize);
             currentBlock = nullptr;
             currentIndex = blockSize;
         }
@@ -184,15 +184,15 @@ void Earcut<N>::operator()(const Polygon& points) {
         do {
             x = p->x;
             y = p->y;
-            minX = min<double>(minX, x);
-            minY = min<double>(minY, y);
-            maxX = max<double>(maxX, x);
-            maxY = max<double>(maxY, y);
+            minX = std::min<double>(minX, x);
+            minY = std::min<double>(minY, y);
+            maxX = std::max<double>(maxX, x);
+            maxY = std::max<double>(maxY, y);
             p = p->next;
         } while (p != outerNode);
 
         // minX, minY and size are later used to transform coords into integers for z-order calculation
-        inv_size = max<double>(maxX - minX, maxY - minY);
+        inv_size = std::max<double>(maxX - minX, maxY - minY);
         inv_size = inv_size != .0 ? (1. / inv_size) : .0;
     }
 
@@ -350,10 +350,10 @@ bool Earcut<N>::isEarHashed(Node* ear) {
     if (area(a, b, c) >= 0) return false; // reflex, can't be an ear
 
     // triangle bbox; min & max are calculated like this for speed
-    const double minTX = min<double>(a->x, min<double>(b->x, c->x));
-    const double minTY = min<double>(a->y, min<double>(b->y, c->y));
-    const double maxTX = max<double>(a->x, max<double>(b->x, c->x));
-    const double maxTY = max<double>(a->y, max<double>(b->y, c->y));
+    const double minTX = std::min<double>(a->x, std::min<double>(b->x, c->x));
+    const double minTY = std::min<double>(a->y, std::min<double>(b->y, c->y));
+    const double maxTX = std::max<double>(a->x, std::max<double>(b->x, c->x));
+    const double maxTY = std::max<double>(a->y, std::max<double>(b->y, c->y));
 
     // z-order range for the current triangle bbox;
     const int32_t minZ = zOrder(minTX, minTY);
@@ -717,10 +717,10 @@ bool Earcut<N>::intersects(const Node* p1, const Node* q1, const Node* p2, const
 // for collinear points p, q, r, check if point q lies on segment pr
 template <typename N>
 bool Earcut<N>::onSegment(const Node* p, const Node* q, const Node* r) {
-    return q->x <= max<double>(p->x, r->x) &&
-        q->x >= min<double>(p->x, r->x) &&
-        q->y <= max<double>(p->y, r->y) &&
-        q->y >= min<double>(p->y, r->y);
+    return q->x <= std::max<double>(p->x, r->x) &&
+        q->x >= std::min<double>(p->x, r->x) &&
+        q->y <= std::max<double>(p->y, r->y) &&
+        q->y >= std::min<double>(p->y, r->y);
 }
 
 template <typename N>
diff --git a/source/common/utility/files.cpp b/source/common/utility/files.cpp
index e93262214..6f915a2ce 100644
--- a/source/common/utility/files.cpp
+++ b/source/common/utility/files.cpp
@@ -34,7 +34,7 @@
 */
 
 #include "files.h"
-#include "templates.h"	// just for 'clamp'
+	// just for 'clamp'
 #include "zstring.h"
 
 
diff --git a/source/common/utility/files_decompress.cpp b/source/common/utility/files_decompress.cpp
index 275076876..7d7d65442 100644
--- a/source/common/utility/files_decompress.cpp
+++ b/source/common/utility/files_decompress.cpp
@@ -42,7 +42,7 @@
 #include <stdexcept>
 
 #include "files.h"
-#include "templates.h"
+
 #include "zstring.h"
 #include "cmdlib.h"
 
diff --git a/source/common/utility/palette.cpp b/source/common/utility/palette.cpp
index e1869562c..28115a521 100644
--- a/source/common/utility/palette.cpp
+++ b/source/common/utility/palette.cpp
@@ -39,7 +39,7 @@
 #include "files.h"
 #include "filesystem.h"
 #include "printf.h"
-#include "templates.h"
+
 #include "m_png.h"
 
 /****************************/
diff --git a/source/common/utility/r_memory.cpp b/source/common/utility/r_memory.cpp
index 99a75d0f7..383cdbeb4 100644
--- a/source/common/utility/r_memory.cpp
+++ b/source/common/utility/r_memory.cpp
@@ -21,7 +21,7 @@
 */
 
 #include <stdlib.h>
-#include "templates.h"
+
 #include "r_memory.h"
 #include <stdlib.h>
 
diff --git a/source/common/utility/s_playlist.cpp b/source/common/utility/s_playlist.cpp
index d284a3e90..d457d0137 100644
--- a/source/common/utility/s_playlist.cpp
+++ b/source/common/utility/s_playlist.cpp
@@ -37,7 +37,7 @@
 
 #include "cmdlib.h"
 #include "s_playlist.h"
-#include "templates.h"
+
 #include "v_text.h"
 #include "files.h"
 
diff --git a/source/core/g_mapinfo.cpp b/source/core/g_mapinfo.cpp
index f5a01f238..509e6f6a7 100644
--- a/source/core/g_mapinfo.cpp
+++ b/source/core/g_mapinfo.cpp
@@ -36,7 +36,7 @@
 #include <assert.h>
 #include "mapinfo.h"
 #include "g_mapinfo.h"
-#include "templates.h"
+
 #include "filesystem.h"
 #include "cmdlib.h"
 #include "v_video.h"
diff --git a/source/core/music/s_advsound.cpp b/source/core/music/s_advsound.cpp
index e6adecb1c..28d9eb3fb 100644
--- a/source/core/music/s_advsound.cpp
+++ b/source/core/music/s_advsound.cpp
@@ -35,7 +35,7 @@
 
 // HEADER FILES ------------------------------------------------------------
 
-#include "templates.h"
+
 #include "c_dispatch.h"
 #include "filesystem.h"
 #include "v_text.h"
diff --git a/source/core/palette.h b/source/core/palette.h
index efc60b428..68e1fe7e5 100644
--- a/source/core/palette.h
+++ b/source/core/palette.h
@@ -15,7 +15,7 @@
 #include "filesystem.h"
 #include "zstring.h"
 #include "palentry.h"
-#include "templates.h"
+
 
 enum
 {
diff --git a/source/core/statusbar2.cpp b/source/core/statusbar2.cpp
index 8f10ed44e..60a232f91 100644
--- a/source/core/statusbar2.cpp
+++ b/source/core/statusbar2.cpp
@@ -36,7 +36,7 @@
 #include <assert.h>
 
 #include "build.h"
-#include "templates.h"
+
 #include "statusbar.h"
 #include "c_cvars.h"
 #include "c_dispatch.h"
diff --git a/source/glbackend/glbackend.h b/source/glbackend/glbackend.h
index 4cd6c1305..9f109c2a2 100644
--- a/source/glbackend/glbackend.h
+++ b/source/glbackend/glbackend.h
@@ -12,7 +12,7 @@
 #include "hw_material.h"
 #include "hw_renderstate.h"
 #include "pm_renderstate.h"
-#include "templates.h"
+
 
 class FShader;
 class FGameTexture;