cleanup of deps against display: builder does not need a display

src/builder.cpp

@@ -14,8 +14,9 @@
 #include "global.hpp"
 
 #include "array.hpp"
-#include "display.hpp"
+#include "builder.hpp"
 #include "log.hpp"
+#include "pathutils.hpp"
 #include "terrain.hpp"
 #include "util.hpp"
 #include "wassert.hpp"

src/builder.hpp

@@ -14,7 +14,7 @@
 #define BUILDER_H_INCLUDED
 
 class config;
-class image::locator;
+#include "image.hpp"
 #include "map.hpp"
 #include "animated.hpp"
 #include "SDL.h"