Clean includes using the output of iwyu tool

src/Author.h

@@ -12,7 +12,7 @@
 #ifndef AUTHOR_H
 #define AUTHOR_H
 
-#include "support/docstring.h"
+#include "support/strfwd.h"
 
 #include <vector>
 

src/BiblioInfo.cpp

@@ -17,13 +17,10 @@
 #include "BiblioInfo.h"
 #include "Buffer.h"
 #include "BufferParams.h"
-#include "buffer_funcs.h"
 #include "Citation.h"
 #include "Encoding.h"
-#include "InsetIterator.h"
 #include "Language.h"
 #include "xml.h"
-#include "Paragraph.h"
 #include "TextClass.h"
 #include "TocBackend.h"
 

src/BiblioInfo.h

@@ -15,7 +15,7 @@
 #ifndef BIBLIOINFO_H
 #define BIBLIOINFO_H
 
-#include "support/docstring.h"
+#include "support/strfwd.h"
 
 #include <map>
 #include <set>

src/Buffer.cpp

@@ -14,7 +14,6 @@
 #include "Buffer.h"
 
 #include "Author.h"
-#include "LayoutFile.h"
 #include "BiblioInfo.h"
 #include "BranchList.h"
 #include "buffer_funcs.h"
@@ -67,9 +66,7 @@
 #include "VCBackend.h"
 #include "version.h"
 #include "WordLangTuple.h"
-#include "WordList.h"
 
-#include "insets/InsetBibtex.h"
 #include "insets/InsetBranch.h"
 #include "insets/InsetInclude.h"
 #include "insets/InsetTabular.h"
@@ -80,7 +77,6 @@
 #include "mathed/InsetMathMacroTemplate.h"
 #include "mathed/MathSupport.h"
 
-#include "graphics/GraphicsCache.h"
 #include "graphics/PreviewLoader.h"
 
 #include "frontends/Application.h"
@@ -97,11 +93,9 @@
 #include "support/FileName.h"
 #include "support/FileNameList.h"
 #include "support/filetools.h"
-#include "support/ForkedCalls.h"
 #include "support/gettext.h"
 #include "support/gzstream.h"
 #include "support/lstrings.h"
-#include "support/lyxalgo.h"
 #include "support/mutex.h"
 #include "support/os.h"
 #include "support/Package.h"

src/Buffer.h

@@ -48,9 +48,9 @@ class MacroNameSet;
 class MacroSet;
 class OutputParams;
 class otexstream;
-class ParConstIterator;
-class ParIterator;
 class ParagraphList;
+class ParIterator;
+class ParConstIterator;
 class TeXErrors;
 class TexRow;
 class TocBackend;
@@ -93,8 +93,6 @@ typedef std::shared_ptr<CloneList> CloneList_ptr;
  * \author Lars Gullik Bjønnes
  */
 
-class MarkAsExporting;
-
 class Buffer {
 public:
 	/// What type of log will \c getLogName() return?

src/BufferEncodings.h

@@ -15,8 +15,8 @@
 #define BUFFER_ENCODINGS_H
 
 #include "Encoding.h"
-#include "support/docstring.h"
-#include "support/types.h"
+
+#include "support/strfwd.h"
 
 namespace lyx {
 

src/BufferList.cpp

@@ -15,10 +15,6 @@
 #include "Author.h"
 #include "Buffer.h"
 #include "BufferParams.h"
-#include "Session.h"
-#include "LyX.h"
-#include "output_latex.h"
-#include "ParagraphList.h"
 
 #include "frontends/alert.h"
 
@@ -27,9 +23,7 @@
 #include "support/FileName.h"
 #include "support/FileNameList.h"
 #include "support/filetools.h"
-#include "support/gettext.h"
 #include "support/lstrings.h"
-#include "support/Package.h"
 
 #include "support/lassert.h"
 

src/BufferList.h

@@ -12,7 +12,7 @@
 #ifndef BUFFER_LIST_H
 #define BUFFER_LIST_H
 
-#include "support/docstring.h"
+#include "support/strfwd.h"
 
 #include <vector>
 

src/BufferParams.cpp

@@ -21,7 +21,6 @@
 #include "LayoutFile.h"
 #include "BranchList.h"
 #include "Buffer.h"
-#include "buffer_funcs.h"
 #include "Bullet.h"
 #include "CiteEnginesList.h"
 #include "Color.h"
@@ -33,7 +32,6 @@
 #include "Language.h"
 #include "LaTeXFeatures.h"
 #include "LaTeXFonts.h"
-#include "ModuleList.h"
 #include "Font.h"
 #include "Lexer.h"
 #include "LyXRC.h"
@@ -50,7 +48,6 @@
 
 #include "support/convert.h"
 #include "support/debug.h"
-#include "support/docstream.h"
 #include "support/FileName.h"
 #include "support/filetools.h"
 #include "support/gettext.h"

src/BufferView.cpp

@@ -18,7 +18,6 @@
 
 #include "BranchList.h"
 #include "Buffer.h"
-#include "buffer_funcs.h"
 #include "BufferList.h"
 #include "BufferParams.h"
 #include "CoordCache.h"
@@ -26,48 +25,34 @@
 #include "CutAndPaste.h"
 #include "DispatchResult.h"
 #include "ErrorList.h"
-#include "factory.h"
-#include "FloatList.h"
 #include "FuncRequest.h"
 #include "FuncStatus.h"
 #include "Intl.h"
-#include "InsetIterator.h"
 #include "Language.h"
-#include "LaTeXFeatures.h"
 #include "LayoutFile.h"
 #include "Lexer.h"
 #include "LyX.h"
 #include "LyXAction.h"
 #include "lyxfind.h"
-#include "Layout.h"
 #include "LyXRC.h"
 #include "MetricsInfo.h"
 #include "Paragraph.h"
-#include "ParagraphParameters.h"
-#include "ParIterator.h"
-#include "RowPainter.h"
 #include "Session.h"
 #include "Text.h"
-#include "TextClass.h"
 #include "TextMetrics.h"
 #include "TexRow.h"
 #include "TocBackend.h"
-#include "WordLangTuple.h"
 
 #include "insets/InsetBibtex.h"
 #include "insets/InsetCitation.h"
 #include "insets/InsetCommand.h" // ChangeRefs
-#include "insets/InsetExternal.h"
 #include "insets/InsetGraphics.h"
-#include "insets/InsetNote.h"
 #include "insets/InsetRef.h"
 #include "insets/InsetText.h"
 
 #include "mathed/MathData.h"
-#include "mathed/InsetMathNest.h"
 
 #include "frontends/alert.h"
-#include "frontends/Application.h"
 #include "frontends/Delegates.h"
 #include "frontends/FontMetrics.h"
 #include "frontends/NullPainter.h"
@@ -76,17 +61,18 @@
 
 #include "support/convert.h"
 #include "support/debug.h"
-#include "support/ExceptionMessage.h"
+#include "support/docstring.h"
 #include "support/filetools.h"
 #include "support/gettext.h"
 #include "support/lassert.h"
 #include "support/Length.h"
 #include "support/lstrings.h"
 #include "support/lyxlib.h"
-#include "support/Package.h"
 #include "support/types.h"
 
+#include <algorithm>
 #include <cerrno>
+#include <cstring>
 #include <fstream>
 #include <functional>
 #include <iterator>

src/Bullet.cpp

@@ -18,6 +18,7 @@
 
 #include "Bullet.h"
 
+#include "support/docstring.h"
 #include "support/lassert.h"
 
 using namespace std;

src/Bullet.h

@@ -13,7 +13,7 @@
 #ifndef BULLET_H
 #define BULLET_H
 
-#include "support/docstring.h"
+#include "support/strfwd.h"
 
 
 namespace lyx {

src/Changes.cpp

@@ -18,7 +18,6 @@
 #include "Buffer.h"
 #include "BufferParams.h"
 #include "Encoding.h"
-#include "LaTeXFeatures.h"
 #include "LyXRC.h"
 #include "MetricsInfo.h"
 #include "OutputParams.h"

src/Compare.cpp

@@ -24,7 +24,6 @@
 
 #include "support/docstream.h"
 #include "support/lassert.h"
-#include "support/lyxalgo.h"
 #include "support/qstring_helpers.h"
 
 using namespace std;

src/Converter.cpp

@@ -13,7 +13,6 @@
 #include "Converter.h"
 
 #include "Buffer.h"
-#include "buffer_funcs.h"
 #include "BufferParams.h"
 #include "ConverterCache.h"
 #include "Encoding.h"

src/Converter.h

@@ -14,7 +14,7 @@
 
 #include "Graph.h"
 #include "OutputParams.h"
-#include "support/trivstring.h"
+#include "support/strfwd.h"
 
 #include <vector>
 #include <set>

src/CoordCache.cpp

@@ -11,12 +11,8 @@
 
 #include "CoordCache.h"
 
-#include "Text.h"
 
 #include "support/debug.h"
-#include "support/docstring.h"
-
-#include "insets/Inset.h"
 
 #include "support/lassert.h"
 

src/Counters.cpp

@@ -20,6 +20,7 @@
 #include "support/convert.h"
 #include "support/counter_reps.h"
 #include "support/debug.h"
+#include "support/docstring.h"
 #include "support/gettext.h"
 #include "support/lassert.h"
 #include "support/lstrings.h"

src/Counters.h

@@ -17,7 +17,7 @@
 
 #include "OutputEnums.h"
 
-#include "support/docstring.h"
+#include "support/strfwd.h"
 
 #include <map>
 #include <vector>

src/Cursor.cpp

@@ -27,7 +27,6 @@
 #include "LyXAction.h"
 #include "LyXRC.h"
 #include "Paragraph.h"
-#include "ParIterator.h"
 #include "Row.h"
 #include "texstream.h"
 #include "Text.h"
@@ -36,12 +35,10 @@
 
 #include "support/debug.h"
 #include "support/docstream.h"
-#include "support/ExceptionMessage.h"
 #include "support/gettext.h"
 #include "support/lassert.h"
 
 #include "insets/InsetTabular.h"
-#include "insets/InsetText.h"
 
 #include "mathed/InsetMath.h"
 #include "mathed/InsetMathBrace.h"
@@ -1435,10 +1432,7 @@ bool Cursor::atFirstOrLastRow(bool up)
 ///////////////////////////////////////////////////////////////////
 
 #include "mathed/InsetMathChar.h"
-#include "mathed/InsetMathGrid.h"
-#include "mathed/InsetMathScript.h"
 #include "mathed/InsetMathUnknown.h"
-#include "mathed/MathFactory.h"
 #include "mathed/MathStream.h"
 #include "mathed/MathSupport.h"
 

src/CursorSlice.cpp

@@ -17,14 +17,14 @@
 
 #include "Text.h"
 #include "Paragraph.h"
+#include "ParagraphList.h"
 
 #include "support/debug.h"
 
 #include "mathed/InsetMath.h"
 #include "mathed/InsetMathMacro.h"
+#include "mathed/MathData.h"
 
-#include "support/ExceptionMessage.h"
-#include "support/gettext.h"
 #include "support/lassert.h"
 
 #include <ostream>

src/CutAndPaste.cpp

@@ -18,7 +18,6 @@
 #include "Author.h"
 #include "BranchList.h"
 #include "Buffer.h"
-#include "buffer_funcs.h"
 #include "BufferList.h"
 #include "BufferParams.h"
 #include "BufferView.h"
@@ -29,7 +28,6 @@
 #include "FuncCode.h"
 #include "FuncRequest.h"
 #include "InsetIterator.h"
-#include "InsetList.h"
 #include "Language.h"
 #include "LyX.h"
 #include "LyXRC.h"
@@ -43,7 +41,6 @@
 #include "insets/InsetBranch.h"
 #include "insets/InsetCitation.h"
 #include "insets/InsetCommand.h"
-#include "insets/InsetFlex.h"
 #include "insets/InsetGraphics.h"
 #include "insets/InsetGraphicsParams.h"
 #include "insets/InsetInclude.h"
@@ -62,13 +59,11 @@
 #include "support/lassert.h"
 #include "support/limited_stack.h"
 #include "support/lstrings.h"
-#include "support/lyxalgo.h"
 #include "support/TempFile.h"
 #include "support/unique_ptr.h"
 
 #include "frontends/alert.h"
 #include "frontends/Clipboard.h"
-#include "frontends/Selection.h"
 
 #include <string>
 #include <tuple>

src/CutAndPaste.h

@@ -16,7 +16,7 @@
 
 #include "DocumentClassPtr.h"
 
-#include "support/docstring.h"
+#include "support/strfwd.h"
 
 #include "insets/Inset.h"
 

src/DepTable.cpp

@@ -16,7 +16,6 @@
 
 #include "support/debug.h"
 #include "support/FileName.h"
-#include "support/filetools.h"
 #include "support/lstrings.h"
 #include "support/lyxtime.h"
 

src/Encoding.cpp

@@ -17,6 +17,7 @@
 #include "Lexer.h"
 
 #include "support/debug.h"
+#include "support/docstring.h"
 #include "support/gettext.h"
 #include "support/lstrings.h"
 #include "support/mutex.h"

src/Encoding.h

@@ -13,8 +13,7 @@
 #ifndef ENCODING_H
 #define ENCODING_H
 
-#include "support/docstring.h"
-#include "support/trivstring.h"
+#include "support/strfwd.h"
 #include "support/types.h"
 
 #include <map>

src/ErrorList.h

@@ -14,8 +14,7 @@
 
 #include "TexRow.h"
 
-#include "support/docstring.h"
-#include "support/types.h"
+#include "support/strfwd.h"
 
 #include <vector>
 

src/FontList.cpp

@@ -20,8 +20,6 @@
 
 #include "FontList.h"
 
-#include "support/lyxalgo.h"
-
 using namespace std;
 
 namespace lyx {

src/Format.h

@@ -12,11 +12,10 @@
 #ifndef FORMAT_H
 #define FORMAT_H
 
-#include "support/docstring.h"
-#include "support/trivstring.h"
-
 #include "OutputParams.h"
 
+#include "support/strfwd.h"
+
 #include <vector>
 
 namespace lyx {

src/FuncRequest.cpp

@@ -14,6 +14,7 @@
 #include "LyXAction.h"
 
 #include "support/debug.h"
+#include "support/docstring.h"
 #include "support/lstrings.h"
 
 #include <climits>

src/FuncRequest.h

@@ -14,7 +14,7 @@
 
 #include "FuncCode.h"
 
-#include "support/docstring.h"
+#include "support/strfwd.h"
 
 #include "frontends/KeyModifier.h"
 #include "frontends/mouse_state.h"

src/FuncStatus.h

@@ -12,7 +12,7 @@
 #ifndef FUNC_STATUS_H
 #define FUNC_STATUS_H
 
-#include "support/docstring.h"
+#include "support/strfwd.h"
 
 
 namespace lyx {

src/Graph.cpp

@@ -17,8 +17,6 @@
 #include "support/debug.h"
 #include "support/lassert.h"
 
-#include <algorithm>
-
 using namespace std;
 
 namespace lyx {

src/HunspellChecker.cpp

@@ -16,17 +16,13 @@
 #include "LyXRC.h"
 #include "WordLangTuple.h"
 
-#include "frontends/alert.h"
-
 #include "support/debug.h"
 #include "support/docstring_list.h"
 #include "support/filetools.h"
 #include "support/Package.h"
 #include "support/FileName.h"
-#include "support/gettext.h"
 #include "support/lassert.h"
 #include "support/lstrings.h"
-#include "support/os.h"
 
 #include <hunspell/hunspell.hxx>
 

src/LaTeX.cpp

@@ -26,6 +26,7 @@
 #include "Language.h"
 
 #include "support/debug.h"
+#include "support/docstring.h"
 #include "support/convert.h"
 #include "support/FileName.h"
 #include "support/filetools.h"

src/LaTeX.h

@@ -16,7 +16,7 @@
 
 #include "OutputParams.h"
 
-#include "support/docstring.h"
+#include "support/strfwd.h"
 #include "support/FileName.h"
 #include "support/signals.h"
 

src/LaTeXFeatures.cpp

@@ -27,7 +27,6 @@
 #include "LaTeXFonts.h"
 #include "LaTeXPackages.h"
 #include "Layout.h"
-#include "Lexer.h"
 #include "LyXRC.h"
 #include "TextClass.h"
 #include "TexRow.h"
@@ -37,9 +36,8 @@
 
 #include "support/debug.h"
 #include "support/docstream.h"
-#include "support/FileName.h"
+#include "support/docstring.h"
 #include "support/filetools.h"
-#include "support/gettext.h"
 #include "support/lstrings.h"
 #include "support/regex.h"
 

src/LaTeXFeatures.h

@@ -14,7 +14,7 @@
 #define LATEXFEATURES_H
 
 #include "OutputParams.h"
-#include "support/docstring.h"
+#include "support/strfwd.h"
 
 #include <set>
 #include <list>

src/Language.cpp

@@ -22,6 +22,7 @@
 #include "LyXRC.h"
 
 #include "support/debug.h"
+#include "support/docstring.h"
 #include "support/FileName.h"
 #include "support/filetools.h"
 #include "support/lassert.h"

src/Language.h

@@ -15,8 +15,7 @@
 #ifndef LANGUAGE_H
 #define LANGUAGE_H
 
-#include "support/docstring.h"
-#include "support/trivstring.h"
+#include "support/strfwd.h"
 
 #include <map>
 #include <set>

src/LayoutFile.cpp

@@ -12,20 +12,13 @@
 #include <config.h>
 
 #include "LayoutFile.h"
-#include "Counters.h"
-#include "Floating.h"
-#include "FloatList.h"
 #include "Lexer.h"
 #include "TextClass.h"
 
-#include "frontends/alert.h"
-
 #include "support/debug.h"
 #include "support/FileName.h"
 #include "support/filetools.h"
-#include "support/gettext.h"
 #include "support/lassert.h"
-#include "support/lstrings.h"
 
 #include "support/regex.h"
 #include "support/TempFile.h"

src/Lexer.cpp

@@ -24,7 +24,6 @@
 #include "support/lassert.h"
 #include "support/lstrings.h"
 #include "support/lyxalgo.h"
-#include "support/types.h"
 
 #include <functional>
 #include <fstream>

src/Lexer.h

@@ -24,8 +24,6 @@ namespace lyx {
 
 namespace support { class FileName; }
 
-class PushPopHelper;
-
 /** A helper structure to describe a keyword for the Lexer.
 	Usually used bundled in C style arrays and passed to the
 	Lexer using a LexerKeywordTable object.

src/LyX.cpp

@@ -38,7 +38,6 @@
 #include "Language.h"
 #include "LaTeXFonts.h"
 #include "LayoutFile.h"
-#include "Lexer.h"
 #include "LyX.h"
 #include "LyXAction.h"
 #include "LyXRC.h"
@@ -47,7 +46,6 @@
 #include "Server.h"
 #include "ServerSocket.h"
 #include "Session.h"
-#include "WordList.h"
 
 #include "frontends/alert.h"
 #include "frontends/Application.h"
@@ -66,7 +64,6 @@
 #include "support/Package.h"
 #include "support/unique_ptr.h"
 
-#include <algorithm>
 #include <csignal>
 #include <iostream>
 #include <functional>

src/LyXRC.cpp

@@ -28,23 +28,18 @@
 #include "Lexer.h"
 #include "LyX.h"
 #include "Mover.h"
-#include "Session.h"
 #include "SpellChecker.h"
 #include "version.h"
 
-#include "graphics/GraphicsTypes.h"
-
 #include "support/convert.h"
 #include "support/debug.h"
 #include "support/environment.h"
 #include "support/FileName.h"
 #include "support/filetools.h"
-#include "support/gettext.h"
 #include "support/lstrings.h"
 #include "support/os.h"
 #include "support/Package.h"
 #include "support/TempFile.h"
-#include "support/userinfo.h"
 
 #ifdef USE_MACOSX_PACKAGING
 #include "support/AppleSupport.h"

src/MetricsInfo.cpp

@@ -10,8 +10,6 @@
 
 #include <config.h>
 
-#include "BufferView.h"
-#include "ColorSet.h"
 #include "LyXRC.h"
 #include "MetricsInfo.h"
 
@@ -22,8 +20,6 @@
 #include "frontends/FontMetrics.h"
 #include "frontends/Painter.h"
 
-#include "support/docstring.h"
-#include "support/lassert.h"
 #include "support/RefChanger.h"
 
 using namespace std;

src/PDFOptions.cpp

@@ -15,10 +15,13 @@
 
 #include "Encoding.h"
 #include "Lexer.h"
+#include "OutputParams.h"
 #include "texstream.h"
 
 #include "support/convert.h"
 #include "support/debug.h"
+#include "support/docstream.h"
+#include "support/docstring.h"
 #include "support/lstrings.h"
 
 #include <sstream>

src/PDFOptions.h

@@ -12,15 +12,13 @@
 #ifndef PDFOPTIONS_H
 #define PDFOPTIONS_H
 
-#include "OutputParams.h"
-
-#include "support/strfwd.h"
-
 #include <string>
 
 namespace lyx {
 
 class Lexer;
+class OutputParams;
+class otexstream;
 
 // FIXME UNICODE
 // Write functions need to use odostream instead of ostream before

src/ParIterator.cpp

@@ -12,7 +12,7 @@
 
 #include "ParIterator.h"
 
-#include "Paragraph.h"
+#include "CursorSlice.h"
 #include "Text.h"
 
 #include "insets/Inset.h"

src/ParIterator.h

@@ -21,6 +21,7 @@ namespace lyx {
 
 class Buffer;
 class Inset;
+class Paragraph;
 class ParagraphList;
 
 

src/Paragraph.cpp

@@ -20,12 +20,11 @@
 
 #include "Paragraph.h"
 
-#include "LayoutFile.h"
 #include "Buffer.h"
 #include "BufferParams.h"
+#include "BufferEncodings.h"
 #include "Changes.h"
 #include "Counters.h"
-#include "BufferEncodings.h"
 #include "InsetList.h"
 #include "Language.h"
 #include "LaTeXFeatures.h"
@@ -42,6 +41,7 @@
 #include "texstream.h"
 #include "TexRow.h"
 #include "Text.h"
+#include "TextClass.h"
 #include "WordLangTuple.h"
 #include "WordList.h"
 

src/Paragraph.h

@@ -16,7 +16,6 @@
 #ifndef PARAGRAPH_H
 #define PARAGRAPH_H
 
-#include "FontEnums.h"
 #include "LayoutEnums.h"
 #include "SpellChecker.h"
 

src/ParagraphMetrics.cpp

@@ -22,34 +22,18 @@
 #include "Buffer.h"
 #include "BufferParams.h"
 #include "BufferView.h"
-#include "Counters.h"
-#include "Encoding.h"
-#include "Language.h"
-#include "LaTeXFeatures.h"
-#include "Layout.h"
 #include "Font.h"
-#include "LyXRC.h"
+#include "Layout.h"
+#include "LayoutEnums.h"
+#include "Paragraph.h"
 #include "Row.h"
-#include "OutputParams.h"
-#include "xml.h"
 #include "TextClass.h"
-#include "TexRow.h"
 
 #include "frontends/FontMetrics.h"
 
-#include "insets/InsetBibitem.h"
-#include "insets/InsetArgument.h"
-
 #include "support/lassert.h"
 #include "support/debug.h"
-#include "support/ExceptionMessage.h"
-#include "support/gettext.h"
-#include "support/lstrings.h"
-#include "support/textutils.h"
 
-#include <algorithm>
-#include <list>
-#include <stack>
 #include <sstream>
 
 using namespace std;

src/ParagraphParameters.cpp

@@ -16,13 +16,12 @@
 
 #include "ParagraphParameters.h"
 
-#include "Buffer.h"
-#include "support/gettext.h"
 #include "Layout.h"
 #include "Lexer.h"
-#include "Text.h"
 #include "Paragraph.h"
 
+#include "support/debug.h"
+#include "support/docstring.h"
 #include "support/lstrings.h"
 
 #include <sstream>

src/ParagraphParameters.h

@@ -17,20 +17,16 @@
 #include "LayoutEnums.h"
 #include "Spacing.h"
 
-#include "support/debug.h"
 #include "support/types.h"
-#include "support/docstring.h"
+#include "support/strfwd.h"
 #include "support/Length.h"
 
 
 namespace lyx {
 
-class BufferView;
 class Layout;
-class Length;
 class Lexer;
 class Paragraph;
-class Spacing;
 
 
 ///

src/PersonalWordList.cpp

@@ -17,15 +17,12 @@
 #include "support/filetools.h"
 #include "support/Package.h"
 #include "support/FileName.h"
-#include "support/lstrings.h"
-#include "support/os.h"
 
 #include <string>
 #include <fstream>
 
 using namespace std;
 using namespace lyx::support;
-using namespace lyx::support::os;
 
 namespace lyx {
 

src/Row.cpp

@@ -26,8 +26,8 @@
 #include "support/debug.h"
 #include "support/lassert.h"
 #include "support/lstrings.h"
-#include "support/lyxalgo.h"
 
+#include <algorithm>
 #include <ostream>
 
 using namespace std;

src/RowPainter.h

@@ -23,8 +23,6 @@ class Paragraph;
 class Text;
 class TextMetrics;
 
-namespace frontend { class Painter; }
-
 /**
  * A class used for painting an individual row of text.
  * FIXME: get rid of that class.

src/ServerSocket.cpp

@@ -18,7 +18,6 @@
 
 #include "DispatchResult.h"
 #include "FuncRequest.h"
-#include "LyX.h"
 #include "LyXAction.h"
 
 #include "frontends/Application.h"

src/TexRow.h

@@ -28,8 +28,7 @@
 #ifndef TEXROW_H
 #define TEXROW_H
 
-#include "support/debug.h"
-#include "support/docstring.h"
+#include "support/strfwd.h"
 #include "support/types.h"
 
 #include <vector>

src/Text.cpp

@@ -22,19 +22,18 @@
 
 #include "Author.h"
 #include "Buffer.h"
-#include "buffer_funcs.h"
 #include "BufferParams.h"
 #include "BufferView.h"
 #include "Changes.h"
 #include "CompletionList.h"
 #include "Cursor.h"
+#include "CursorSlice.h"
 #include "CutAndPaste.h"
 #include "DispatchResult.h"
 #include "Encoding.h"
 #include "ErrorList.h"
-#include "FuncRequest.h"
 #include "factory.h"
-#include "InsetList.h"
+#include "Font.h"
 #include "Language.h"
 #include "Layout.h"
 #include "Lexer.h"
@@ -42,31 +41,25 @@
 #include "LyXRC.h"
 #include "Paragraph.h"
 #include "ParagraphParameters.h"
-#include "ParIterator.h"
 #include "TextClass.h"
 #include "TextMetrics.h"
-#include "WordLangTuple.h"
+#include "Undo.h"
 #include "WordList.h"
 
+#include "insets/Inset.h"
 #include "insets/InsetText.h"
-#include "insets/InsetBibitem.h"
 #include "insets/InsetCaption.h"
-#include "insets/InsetNewline.h"
-#include "insets/InsetNewpage.h"
-#include "insets/InsetArgument.h"
 #include "insets/InsetIPAMacro.h"
-#include "insets/InsetSpace.h"
 #include "insets/InsetSpecialChar.h"
 #include "insets/InsetTabular.h"
 
 #include "support/convert.h"
 #include "support/debug.h"
 #include "support/docstream.h"
+#include "support/docstring.h"
 #include "support/gettext.h"
 #include "support/lassert.h"
-#include "support/Length.h"
 #include "support/lstrings.h"
-#include "support/lyxalgo.h"
 #include "support/lyxtime.h"
 #include "support/textutils.h"
 #include "support/unique_ptr.h"

src/Text.h

@@ -19,14 +19,13 @@
 
 namespace lyx {
 
-class Buffer;
 class BufferParams;
 class BufferView;
+class Change;
 class CompletionList;
 class Cursor;
 class CursorData;
 class CursorSlice;
-class DocIterator;
 class ErrorList;
 class Font;
 class FontInfo;
@@ -35,8 +34,8 @@ class FuncStatus;
 class Inset;
 class InsetText;
 class Lexer;
-class PainterInfo;
-class Spacing;
+class Paragraph;
+class ParagraphParameters;
 
 /// This class encapsulates the main text data and operations in LyX.
 /// This is more or less the private implementation of InsetText.

src/Text2.cpp

@@ -23,34 +23,22 @@
 #include "Text.h"
 
 #include "Buffer.h"
-#include "buffer_funcs.h"
-#include "BufferList.h"
 #include "BufferParams.h"
 #include "BufferView.h"
 #include "Changes.h"
 #include "Cursor.h"
-#include "CutAndPaste.h"
-#include "DispatchResult.h"
-#include "ErrorList.h"
 #include "Language.h"
 #include "Layout.h"
-#include "Lexer.h"
-#include "LyX.h"
 #include "LyXRC.h"
 #include "Paragraph.h"
 #include "ParagraphParameters.h"
 #include "TextClass.h"
 #include "TextMetrics.h"
 
-#include "insets/InsetCollapsible.h"
-
-#include "mathed/InsetMathHull.h"
+#include "insets/InsetText.h"
 
 #include "support/lassert.h"
-#include "support/debug.h"
 #include "support/gettext.h"
-#include "support/lyxalgo.h"
-#include "support/textutils.h"
 
 #include <sstream>
 

src/Text3.cpp

@@ -18,18 +18,15 @@
 #include "Text.h"
 
 #include "BranchList.h"
-#include "FloatList.h"
-#include "FuncStatus.h"
 #include "Buffer.h"
-#include "buffer_funcs.h"
 #include "BufferParams.h"
 #include "BufferView.h"
-#include "Changes.h"
 #include "Cursor.h"
 #include "CutAndPaste.h"
 #include "DispatchResult.h"
-#include "ErrorList.h"
 #include "factory.h"
+#include "FloatList.h"
+#include "FuncStatus.h"
 #include "FuncRequest.h"
 #include "InsetList.h"
 #include "Intl.h"
@@ -75,9 +72,6 @@
 #include "support/lassert.h"
 #include "support/limited_stack.h"
 #include "support/lstrings.h"
-#include "support/lyxalgo.h"
-#include "support/lyxtime.h"
-#include "support/os.h"
 #include "support/regex.h"
 
 #include "mathed/InsetMathHull.h"

src/TextClass.cpp

@@ -16,22 +16,19 @@
 
 #include "TextClass.h"
 
-#include "LayoutFile.h"
 #include "CiteEnginesList.h"
-#include "Color.h"
 #include "Counters.h"
 #include "Floating.h"
 #include "FloatList.h"
 #include "Layout.h"
+#include "LayoutFile.h"
 #include "Lexer.h"
-#include "Font.h"
 #include "ModuleList.h"
 
 #include "frontends/alert.h"
 
 #include "support/lassert.h"
 #include "support/debug.h"
-#include "support/ExceptionMessage.h"
 #include "support/FileName.h"
 #include "support/filetools.h"
 #include "support/gettext.h"

src/TextMetrics.cpp

@@ -36,15 +36,13 @@
 
 #include "insets/InsetText.h"
 
-#include "mathed/InsetMathMacroTemplate.h"
+#include "mathed/MacroTable.h"
 
 #include "frontends/FontMetrics.h"
 #include "frontends/NullPainter.h"
 
-#include "support/convert.h"
 #include "support/debug.h"
 #include "support/lassert.h"
-#include "support/lyxlib.h"
 #include "support/RefChanger.h"
 
 #include <stdlib.h>

src/TextMetrics.h

@@ -28,7 +28,6 @@ namespace lyx {
 class BufferView;
 class Cursor;
 class CursorSlice;
-class DocIterator;
 class MetricsInfo;
 class Text;
 

src/Thesaurus.cpp

@@ -21,17 +21,15 @@
 #include "support/FileNameList.h"
 #include "support/Package.h"
 #include "support/debug.h"
+#include "support/docstring.h"
 #include "support/docstring_list.h"
 #include "support/filetools.h"
-#include "support/gettext.h"
 #include "support/lstrings.h"
 #include "support/os.h"
 
 #include <cstdio>
 #include MYTHES_H_LOCATION
 
-#include "frontends/alert.h"
-
 #include <algorithm>
 #include <cstring>
 #include <fstream>

src/Thesaurus.h

@@ -13,14 +13,15 @@
 #ifndef THESAURUS_H
 #define THESAURUS_H
 
-#include "support/docstring.h"
-#include "WordLangTuple.h"
+#include "support/strfwd.h"
 
 #include <map>
 #include <vector>
 
 namespace lyx {
 
+class WordLangTuple;
+
 /**
  * This class provides an interface to whatever thesauri we might support.
  */

src/TocBuilder.cpp

@@ -12,6 +12,7 @@
 
 #include "TocBuilder.h"
 
+#include "DocIterator.h"
 #include "TocBackend.h"
 
 #include "support/lassert.h"

src/TocBuilder.h

@@ -12,7 +12,6 @@
 #ifndef TOC_BUILDER_H
 #define TOC_BUILDER_H
 
-#include "DocIterator.h"
 #include "Toc.h"
 
 #include "support/strfwd.h"
@@ -22,6 +21,7 @@
 
 namespace lyx {
 
+class DocIterator;
 
 /// Caption-enabled TOC builders
 class TocBuilder

src/Trans.cpp

@@ -13,11 +13,7 @@
 
 #include "Trans.h"
 
-#include "Buffer.h"
-#include "BufferView.h"
-#include "Cursor.h"
 #include "Lexer.h"
-#include "LyXRC.h"
 #include "Text.h"
 
 #include "support/debug.h"

src/Undo.cpp

@@ -20,7 +20,6 @@
 #include "Buffer.h"
 #include "BufferList.h"
 #include "BufferParams.h"
-#include "buffer_funcs.h"
 #include "Cursor.h"
 #include "CutAndPaste.h"
 #include "ErrorList.h"
@@ -28,14 +27,12 @@
 #include "ParagraphList.h"
 #include "Text.h"
 
-#include "mathed/MathSupport.h"
 #include "mathed/MathData.h"
 
 #include "insets/Inset.h"
 #include "insets/InsetText.h"
 
 #include "support/debug.h"
-#include "support/gettext.h"
 #include "support/lassert.h"
 #include "support/lyxtime.h"
 

src/Undo.h

@@ -22,11 +22,8 @@
 namespace lyx {
 
 class Buffer;
-class BufferParams;
 class CursorData;
 class Inset;
-class MathData;
-class ParagraphList;
 
 /// This is used to combine consecutive undo recordings of the same kind.
 enum UndoKind {

src/VCBackend.cpp

@@ -13,7 +13,6 @@
 
 #include "VCBackend.h"
 #include "Buffer.h"
-#include "DispatchResult.h"
 #include "LyX.h"
 #include "FuncRequest.h"
 

src/VSpace.cpp

@@ -16,7 +16,6 @@
 #include "BufferParams.h"
 #include "BufferView.h"
 #include "support/gettext.h"
-#include "Text.h"
 #include "TextMetrics.h" // for defaultRowHeight()
 
 #include "support/convert.h"

src/factory.cpp

@@ -12,13 +12,9 @@
 
 #include "factory.h"
 
-#include "Buffer.h"
-#include "BufferParams.h"
-#include "FloatList.h"
 #include "FuncRequest.h"
 #include "Lexer.h"
 #include "LyX.h"
-#include "TextClass.h"
 
 #include "insets/InsetBibitem.h"
 #include "insets/InsetBibtex.h"
@@ -51,6 +47,7 @@
 #include "insets/InsetArgument.h"
 #include "insets/InsetPhantom.h"
 #include "insets/InsetPreview.h"
+#include "insets/InsetQuotes.h"
 #include "insets/InsetRef.h"
 #include "insets/InsetScript.h"
 #include "insets/InsetSeparator.h"
@@ -67,7 +64,6 @@
 
 #include "support/debug.h"
 #include "support/ExceptionMessage.h"
-#include "support/lassert.h"
 #include "support/lstrings.h"
 #include "support/unique_ptr.h"
 

src/insets/InsetText.cpp

@@ -51,6 +51,7 @@
 #include "Text.h"
 #include "TextMetrics.h"
 #include "TocBackend.h"
+#include "TocBuilder.h"
 
 #include "frontends/alert.h"
 #include "frontends/Painter.h"
@@ -63,6 +64,7 @@
 #include "support/RefChanger.h"
 
 #include <algorithm>
+#include <stack>
 
 
 using namespace std;

src/lyxfind.cpp

@@ -17,7 +17,6 @@
 #include "lyxfind.h"
 
 #include "Buffer.h"
-#include "buffer_funcs.h"
 #include "BufferList.h"
 #include "BufferParams.h"
 #include "BufferView.h"
@@ -29,8 +28,6 @@
 #include "output_latex.h"
 #include "OutputParams.h"
 #include "Paragraph.h"
-#include "ParIterator.h"
-#include "TexRow.h"
 #include "Text.h"
 #include "Encoding.h"
 

src/lyxfind.h

@@ -23,14 +23,10 @@
 
 namespace lyx {
 
-
-
-class Buffer;
 class Cursor;
 class BufferView;
 class DocIterator;
 class FuncRequest;
-class Text;
 
 /** Encode the parameters needed to find \c search as a string
  *  that can be dispatched to the LyX core in a FuncRequest wrapper.

src/output_xhtml.cpp

@@ -15,7 +15,6 @@
 #include "output_xhtml.h"
 
 #include "Buffer.h"
-#include "buffer_funcs.h"
 #include "BufferParams.h"
 #include "Counters.h"
 #include "Font.h"
@@ -28,11 +27,7 @@
 #include "Text.h"
 #include "TextClass.h"
 
-#include "support/convert.h"
-#include "support/debug.h"
 #include "support/lassert.h"
-#include "support/lstrings.h"
-#include "support/textutils.h"
 
 #include <stack>
 #include <iostream>