#include "buffer.h"
#include "debug.h"
#include "lyxrc.h"
-#include "LyXView.h"
+#include "frontends/LyXView.h"
#include "frontends/Painter.h"
+#include "frontends/screen.h"
#include "tracer.h"
#include "font.h"
#include "encoding.h"
-#include "lyxscreen.h"
#include "bufferview_funcs.h"
#include "BufferView.h"
#include "language.h"