#include "formulamacro.h"
-#include "commandtags.h"
+#include "lfuns.h"
#include "math_cursor.h"
#include "math_parser.h"
#include "math_macro.h"
#include "math_macrotable.h"
#include "math_macrotemplate.h"
-#include "math_metricsinfo.h"
+#include "metricsinfo.h"
#include "math_support.h"
#include "math_mathmlstream.h"
#include "BufferView.h"
#include "Lsstream.h"
-#include "BoostFormat.h"
+#include "support/BoostFormat.h"
using std::ostream;
LyXFont font(f);
font.setColor(LColor::math);
- MathPainterInfo pi = MathPainterInfo(bv->painter());
+ PainterInfo pi = PainterInfo(bv->painter());
pi.base.style = LM_ST_TEXT;
pi.base.font = font;