Use forward declarations more to avoid excessive includes

3 files changed, 3 insertions, 1 deletions

diff --git a/src/interface/Label.cpp b/src/interface/Label.cpp
index ee52fd8..976c788 100644
--- a/src/interface/Label.cpp
+++ b/src/interface/Label.cpp
@@ -2,6 +2,7 @@
 #include "Config.h"
 #include "Point.h"
 #include "Label.h"
+#include "Keys.h"
 #include "ContextMenu.h"
 
 using namespace ui;
diff --git a/src/interface/SaveButton.cpp b/src/interface/SaveButton.cpp
index 18e382d..cc90a2f 100644
--- a/src/interface/SaveButton.cpp
+++ b/src/interface/SaveButton.cpp
@@ -222,7 +222,7 @@ void SaveButton::Draw(const Point& screenPos)
 				g->drawrect(screenPos.X-3+(Size.X-thumbBoxSize.X)/2, screenPos.Y+(Size.Y-21-thumbBoxSize.Y)/2, thumbBoxSize.X, thumbBoxSize.Y, 180, 180, 180, 255);
 			g->drawrect(screenPos.X-4+thumbBoxSize.X+(Size.X-thumbBoxSize.X)/2, screenPos.Y+(Size.Y-21-thumbBoxSize.Y)/2, 7, thumbBoxSize.Y, 180, 180, 180, 255);
 
-			int voteBar = max(10.0f, ((float)(thumbBoxSize.Y-4))*voteRatio);
+			int voteBar = std::max(10.0f, ((float)(thumbBoxSize.Y-4))*voteRatio);
 			g->fillrect(1+screenPos.X-3+thumbBoxSize.X+(Size.X-thumbBoxSize.X)/2, (screenPos.Y-2)+(thumbBoxSize.Y-voteBar)+(Size.Y-21-thumbBoxSize.Y)/2, 3, voteBar, voteColour.Red, voteColour.Green, voteColour.Blue, 255);
 		}
 		else
diff --git a/src/interface/Window.cpp b/src/interface/Window.cpp
index 2914b1e..7a376d8 100644
--- a/src/interface/Window.cpp
+++ b/src/interface/Window.cpp
@@ -1,5 +1,6 @@
 #include <iostream>
 #include "Window.h"
+#include "Keys.h"
 #include "Component.h"
 #include "interface/Point.h"
 #include "interface/Button.h"