#include <Main/fg_props.hxx>
#include <Main/viewmgr.hxx>
#include <Time/light.hxx>
-#include <GUI/new_gui.hxx> // FGFontCache
+#include <GUI/FGFontCache.hxx>
#include <Main/viewer.hxx>
#include <Instrumentation/dclgps.hxx>
-#include "hud.hxx"
-
-
#define WIN_X 0
#define WIN_Y 0
#define WIN_W 1024
// my hardware/driver requires many more.
#define POFF_UNITS 8
+using std::map;
+
////////////////////////////////////////////////////////////////////////
// Local functions.
////////////////////////////////////////////////////////////////////////