Little ugly, but we can get rid of QString as well.

This occurs when importing the sampleart.ltx file from ltugboat document class.

src/frontends/qt/ButtonController.cpp

@@ -24,6 +24,7 @@
 #include <QLabel>
 #include <QList>
 #include <QTabWidget>
+#include <QTabBar>
 #include <QValidator>
 
 

src/frontends/qt/GuiAbout.cpp

@@ -26,6 +26,7 @@
 #include <QClipboard>
 #include <QDate>
 #include <QFile>
+#include <QRegularExpression>
 #include <QTextStream>
 
 using namespace lyx::support;

src/frontends/qt/GuiApplication.cpp

@@ -113,6 +113,7 @@
 #include <QSocketNotifier>
 #include <QSortFilterProxyModel>
 #include <QStandardItemModel>
+#include <QStyle>
 #include <QSvgRenderer>
 #include <QTimer>
 #include <QTranslator>

src/frontends/qt/GuiDialog.cpp

@@ -22,6 +22,7 @@
 #include <QCloseEvent>
 #include <QDialogButtonBox>
 #include <QColorDialog>
+#include <QRegularExpression>
 
 using namespace std;
 

src/frontends/qt/GuiFontMetrics.cpp

@@ -28,6 +28,7 @@
 #include "support/pmprof.h"
 
 #include <QByteArray>
+#include <QFontInfo>
 #include <QRawFont>
 #include <QtEndian>
 

src/frontends/qt/GuiLog.cpp

@@ -24,6 +24,7 @@
 #include "support/Lexer.h"
 #include "support/lstrings.h"
 
+#include "Buffer.h"
 #include "BufferParams.h"
 #include "IndicesList.h"
 

src/frontends/qt/LaTeXHighlighter.cpp

@@ -13,6 +13,8 @@
 #include "LaTeXHighlighter.h"
 #include "qt_helpers.h"
 
+#include <QPalette>
+#include <QRegularExpression>
 #include <QString>
 #include <QTextDocument>
 

src/frontends/qt/Toolbars.cpp

@@ -16,6 +16,8 @@
 #include "Format.h"
 #include "FuncRequest.h"
 #include "LyXAction.h"
+
+#include <QString>
 #include "qt_helpers.h"
 
 #include "support/debug.h"

src/frontends/qt/qt_helpers.cpp

@@ -12,8 +12,10 @@
 
 #include <config.h>
 
+#include <QString>
 #include "qt_helpers.h"
 
+#include "Buffer.h"
 #include "Format.h"
 #include "LengthCombo.h"
 #include "LyXRC.h"
@@ -33,6 +35,7 @@
 #include <QComboBox>
 #include <QDesktopServices>
 #include <QDir>
+#include <QHeaderView>
 #include <QInputDialog>
 #include <QLineEdit>
 #include <QMessageBox>

src/frontends/qt/qt_helpers.h

@@ -13,7 +13,6 @@
 #ifndef QTHELPERS_H
 #define QTHELPERS_H
 
-#include "Buffer.h"
 #include "ColorSet.h"
 #include "support/Length.h"
 #include "support/qstring_helpers.h"
@@ -22,15 +21,16 @@
 
 #include <list>
 
-#include <QHeaderView>
-
 class QComboBox;
 class QLineEdit;
 class QString;
 class QWidget;
+class QAbstractItemView;
 
 namespace lyx {
 
+class Buffer;
+
 namespace support { class FileName; }
 
 namespace frontend {

src/tex2lyx/Parser.cpp

@@ -882,6 +882,9 @@ void Parser::tokenize_one()
 		if (!is_) {
 			error("unexpected end of input");
 		} else {
+			// A single \ at the end of a line is like "\ "
+			if (catcode(c) == catNewline)
+				c = ' ';
 			docstring s(1, c);
 			if (catcode(c) == catLetter) {
 				// collect letters