Index: source/gui/CSlider.cpp
===================================================================
--- source/gui/CSlider.cpp
+++ source/gui/CSlider.cpp
@@ -16,9 +16,12 @@
  */
 
 #include "precompiled.h"
+
 #include "CSlider.h"
-#include "GUI.h"
+
+#include "gui/GUI.h"
 #include "lib/ogl.h"
+#include "maths/MathUtil.h"
 
 CSlider::CSlider(CGUI& pGUI)
 	: IGUIObject(pGUI), m_IsPressed(false), m_ButtonSide(0)
Index: source/lib/lib.h
===================================================================
--- source/lib/lib.h
+++ source/lib/lib.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2010 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files (the
@@ -63,14 +63,6 @@
 #include <cmath>	// fabsf
 #include <limits>	// numeric_limits
 #include <stdexcept>	// out_of_range
-#include <algorithm>	// min, max
-
-template<typename T>
-T Clamp(T val, T min, T max)
-{
-	ASSERT(min <= max);
-	return std::max(min, std::min(val, max));
-}
 
 template<typename T>
 T DivideRoundUp(T dividend, T divisor)
Index: source/maths/MathUtil.h
===================================================================
--- source/maths/MathUtil.h
+++ source/maths/MathUtil.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2010 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -23,24 +23,28 @@
 #define SQR(x)						((x) * (x))
 
 template <typename T>
-inline T Interpolate(const T& a, const T& b, float l)
+inline T Interpolate(T a, T b, float t)
 {
-	return a + (b - a) * l;
+	return a + (b - a) * t;
 }
 
 template <typename T>
-inline T clamp(T value, T min, T max)
+inline T Clamp(T value, T min, T max)
 {
-	if (value <= min) return min;
-	else if (value >= max) return max;
-	else return value;
+	if (value <= min)
+		return min;
+	else if (value >= max)
+		return max;
+	return value;
 }
 
 inline float sgn(float a)
 {
-    if (a > 0.0f) return 1.0f;
-    if (a < 0.0f) return -1.0f;
+    if (a > 0.0f)
+    	return 1.0f;
+    if (a < 0.0f)
+    	return -1.0f;
     return 0.0f;
 }
 
-#endif
+#endif // INCLUDED_MATHUTIL
Index: source/soundmanager/data/ogg.cpp
===================================================================
--- source/soundmanager/data/ogg.cpp
+++ source/soundmanager/data/ogg.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2012 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -20,14 +20,13 @@
 
 #if CONFIG2_AUDIO
 
+#include "lib/byte_order.h"
 #include "lib/external_libraries/openal.h"
 #include "lib/external_libraries/vorbis.h"
-
-#include "lib/byte_order.h"
-#include "lib/file/io/io.h"
 #include "lib/file/file_system.h"
-
+#include "lib/file/io/io.h"
 #include "lib/file/vfs/vfs_util.h"
+#include "maths/MathUtil.h"
 #include "ps/CLogger.h"
 #include "ps/Filesystem.h"