--- a/src/fontcache.cpp	Fri Nov 23 16:59:30 2007 +0000
+++ b/src/fontcache.cpp	Wed Jan 09 18:11:12 2008 +0000
@@ -4,18 +4,16 @@
 
 #include "stdafx.h"
 #include "openttd.h"
-#include "functions.h"
-#include "macros.h"
 #include "debug.h"
 #include "table/sprites.h"
 #include "table/control_codes.h"
 #include "spritecache.h"
-#include "gfx.h"
-#include "string.h"
 #include "fontcache.h"
-#include "helpers.hpp"
 #include "spriteloader/spriteloader.hpp"
 #include "blitter/factory.hpp"
+#include "gfx_func.h"
+#include "core/alloc_func.hpp"
+#include "core/math_func.hpp"
 
 #ifdef WITH_FREETYPE
 
@@ -365,7 +363,7 @@
 
 void *AllocateFont(size_t size)
 {
-	return malloc(size);
+	return MallocT<byte>(size);
 }