diff --git a/source/build/include/build.h b/source/build/include/build.h
index c121be63b..25eff6c26 100644
--- a/source/build/include/build.h
+++ b/source/build/include/build.h
@@ -17,7 +17,6 @@ static_assert('\xff' == 255, "Char must be unsigned!");
 
 #include "printf.h"
 #include "palette.h"
-#include "binaryangle.h"
 
     //Make all variables in BUILD.H defined in the ENGINE,
     //and externed in GAME
diff --git a/source/core/binaryangle.h b/source/core/fixedhorizon.h
similarity index 96%
rename from source/core/binaryangle.h
rename to source/core/fixedhorizon.h
index b394d9b5f..6d32957de 100644
--- a/source/core/binaryangle.h
+++ b/source/core/fixedhorizon.h
@@ -1,11 +1,10 @@
 /*
-** binaryangle.h
+** fixedhorizon.h
 **
-** type safe representations of high precision angle and horizon values. 
-** Angle uses natural 32 bit overflow to clamp to one rotation.
+** type safe representations of high precision horizon values. 
 **
 **---------------------------------------------------------------------------
-** Copyright 2020 Christoph Oelckers
+** Copyright 2020-2022 Christoph Oelckers
 ** All rights reserved.
 **
 ** Redistribution and use in source and binary forms, with or without
diff --git a/source/core/gamefuncs.h b/source/core/gamefuncs.h
index f2ac26834..0edd989b9 100644
--- a/source/core/gamefuncs.h
+++ b/source/core/gamefuncs.h
@@ -1,7 +1,6 @@
 #pragma once
 
 #include "gamecontrol.h"
-#include "binaryangle.h"
 #include "build.h"
 #include "coreactor.h"
 #include "intrect.h"
diff --git a/source/core/gameinput.h b/source/core/gameinput.h
index 659afbe24..f1e7c0b76 100644
--- a/source/core/gameinput.h
+++ b/source/core/gameinput.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "m_fixed.h"
-#include "binaryangle.h"
+#include "fixedhorizon.h"
 #include "interphelpers.h"
 #include "gamecvars.h"
 #include "gamestruct.h"
diff --git a/source/core/gamestruct.h b/source/core/gamestruct.h
index c10b530b5..96a1621ae 100644
--- a/source/core/gamestruct.h
+++ b/source/core/gamestruct.h
@@ -7,7 +7,7 @@ bool System_WantGuiCapture();	// During playing this tells us whether the game m
 #include "engineerrors.h"
 #include "stats.h"
 #include "packet.h"
-#include "binaryangle.h"
+#include "fixedhorizon.h"
 #include "inputstate.h"
 #include "maptypes.h"
 
diff --git a/source/core/interphelpers.h b/source/core/interphelpers.h
index 356288f54..83045b440 100644
--- a/source/core/interphelpers.h
+++ b/source/core/interphelpers.h
@@ -35,6 +35,8 @@
 
 #pragma once
 
+#include "fixedhorizon.h"
+
 inline constexpr int32_t interpolatedvalue(int32_t oval, int32_t val, double const smoothratio, int const scale = 16)
 {
 	return oval + MulScale(val - oval, int(smoothratio), scale);
diff --git a/source/core/maptypes.h b/source/core/maptypes.h
index e5708c2c0..b0be0da19 100644
--- a/source/core/maptypes.h
+++ b/source/core/maptypes.h
@@ -31,7 +31,6 @@ Prepared for public release: 03/21/2003 - Charlie Wiederhold, 3D Realms
 #include "tarray.h"
 #include "tflags.h"
 #include "intvec.h"
-#include "binaryangle.h"
 #include "dobject.h"
 
 void MarkVerticesForSector(int sector);
diff --git a/source/core/rendering/scene/hw_clipper.h b/source/core/rendering/scene/hw_clipper.h
index 4b41e15b9..828141ef9 100644
--- a/source/core/rendering/scene/hw_clipper.h
+++ b/source/core/rendering/scene/hw_clipper.h
@@ -5,7 +5,6 @@
 #include "memarena.h"
 #include "basics.h"
 #include "vectors.h"
-#include "binaryangle.h"
 #include "intvec.h"
 
 class ClipNode