#include <config.h>
#include "xfont_metrics.h"
+#include "font_metrics.h"
#include "xfont_loader.h"
#include "encoding.h"
#include <boost/scoped_array.hpp>
-using namespace lyx::support;
+using lyx::support::uppercase;
+
+using std::string;
namespace {