#include "frontends/LyXView.h"
#include "frontends/WorkArea.h"
-#include "funcrequest.h"
+#include "FuncRequest.h"
#include "FuncStatus.h"
-#include "lyx_main.h" // for lyx::use_gui
-#include "lyxfont.h"
-#include "lyxfunc.h"
-#include "lyxrc.h"
+#include "LyX.h" // for lyx::use_gui
+#include "Font.h"
+#include "LyXFunc.h"
+#include "LyXRC.h"
#include "support/lstrings.h"
#include "support/os.h"
}
-frontend::FontMetrics const & theFontMetrics(LyXFont const & f)
+frontend::FontMetrics const & theFontMetrics(Font const & f)
{
static frontend::NoGuiFontMetrics no_gui_font_metrics;