--- a/src/newgrf_townname.cpp	Mon Dec 03 23:39:38 2007 +0000
+++ b/src/newgrf_townname.cpp	Tue Jan 22 21:00:30 2008 +0000
@@ -8,9 +8,11 @@
 
 #include "stdafx.h"
 #include "openttd.h"
+#include "newgrf_townname.h"
+#include "core/alloc_func.hpp"
+#include "string_func.h"
+
 #include "table/strings.h"
-#include "newgrf_townname.h"
-#include "string.h"
 
 static GRFTownName *_grf_townnames = NULL;