diff --git a/source/common/console/c_cvars.h b/source/common/console/c_cvars.h
index 37ae5903d..1b3ac6fa9 100644
--- a/source/common/console/c_cvars.h
+++ b/source/common/console/c_cvars.h
@@ -109,8 +109,8 @@ class FBaseCVar;
 struct ConsoleCallbacks
 {
 	void (*UserInfoChanged)(FBaseCVar*);
-	void (*SendServerInfoChange)(FBaseCVar* cvar, UCVarValue value, ECVarType type);
-	void (*SendServerFlagChange)(FBaseCVar* cvar, int bitnum, bool set, bool silent);
+	bool (*SendServerInfoChange)(FBaseCVar* cvar, UCVarValue value, ECVarType type);
+	bool (*SendServerFlagChange)(FBaseCVar* cvar, int bitnum, bool set, bool silent);
 	FBaseCVar* (*GetUserCVar)(int playernum, const char* cvarname);
 	bool (*MustLatch)();
 
diff --git a/source/core/2d/v_2ddrawer.h b/source/core/2d/v_2ddrawer.h
index 032cecde6..46d96875f 100644
--- a/source/core/2d/v_2ddrawer.h
+++ b/source/core/2d/v_2ddrawer.h
@@ -7,6 +7,7 @@
 #include "renderstyle.h"
 
 struct DrawParms;
+class FFont;
 
 
 struct F2DPolygons