#include <boost/regex.hpp>
#include <boost/scoped_array.hpp>
#include <boost/scoped_ptr.hpp>
-#include <boost/signal.hpp>
-#include <boost/signals/connection.hpp>
-#include <boost/signals/trackable.hpp>
+#include <boost/signals2.hpp>
+#include <boost/signals2/connection.hpp>
+#include <boost/signals2/trackable.hpp>
#include <boost/tokenizer.hpp>
#include <boost/tuple/tuple.hpp>
#include <boost/utility.hpp>
#endif
-#if defined(LYX_PCH_QT4) && defined(LYX_BUILD_QT4_FRONTEND)
+#if defined(LYX_PCH_QT) && defined(LYX_BUILD_QT_FRONTEND)
#include <QtCore>
-#include <QtGUI>
+#include <QtGui>
#endif