Clean includes using the output of iwyu tool

diff --git a/src/Author.h b/src/Author.h
index 798cfd80433499f236c2462645ab42e33cbc705e..aa48b5dd24adc511a22ae9b3258d704950485b9a 100644 (file)
--- a/src/Author.h
+++ b/src/Author.h
@@ -12,7 +12,7 @@
 #ifndef AUTHOR_H
 #define AUTHOR_H
 
-#include "support/docstring.h"
+#include "support/strfwd.h"
 
 #include <vector>
 

diff --git a/src/BiblioInfo.cpp b/src/BiblioInfo.cpp
index 486bd5c1e51d652c2f3265fda33626786754da5c..cefee85ba9ae154b2390d103ed895f2c9166bf2a 100644 (file)
--- a/src/BiblioInfo.cpp
+++ b/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"
 

diff --git a/src/BiblioInfo.h b/src/BiblioInfo.h
index ca5cdad366305a8e3749d47a3a4e4cf97dec90cf..008c7c753e053a0a06bcd596d370042994bf3d42 100644 (file)
--- a/src/BiblioInfo.h
+++ b/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>

diff --git a/src/Buffer.cpp b/src/Buffer.cpp
index 53ff15b4f6cad6674fa1c215ea16a95ffb74ac09..9ba2373ea43db47c8e7f036343996cb7720803e8 100644 (file)
--- a/src/Buffer.cpp
+++ b/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"

diff --git a/src/Buffer.h b/src/Buffer.h
index 2d96ff938e6b4a43499f97f19231fe2aa1a2a152..f65d31d654d06070f95b34b73a247cf70133e34d 100644 (file)
--- a/src/Buffer.h
+++ b/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?

diff --git a/src/BufferEncodings.h b/src/BufferEncodings.h
index 89275b32e7b5f916a3973ae74b007b9e3954b317..d5a9081f0977d1d7152e10e9f5148ce67f221093 100644 (file)
--- a/src/BufferEncodings.h
+++ b/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 {
 

diff --git a/src/BufferList.cpp b/src/BufferList.cpp
index b99f4592ccda0768947da35753d0fbcc0cac3f97..0cfbec135da4b55253ba5f92f53a77347728508c 100644 (file)
--- a/src/BufferList.cpp
+++ b/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"
 

diff --git a/src/BufferList.h b/src/BufferList.h
index 053169af611e2533d264d9b9bf22f38b6c600751..ff5156657b95e84331a5882bf19991b09d1ff100 100644 (file)
--- a/src/BufferList.h
+++ b/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>
 

diff --git a/src/BufferParams.cpp b/src/BufferParams.cpp
index 8d0d7d13d4d07bb54099dac179fa3ecc05c64cc4..9d45d80d1034738d704496c9b275829dbbe652e1 100644 (file)
--- a/src/BufferParams.cpp
+++ b/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"

diff --git a/src/BufferView.cpp b/src/BufferView.cpp
index 88fe8fa02366b3197ce11c91045bde1dad216a46..fbfe41c6dbeb465a7135216a6284b4ae5f0fa4be 100644 (file)
--- a/src/BufferView.cpp
+++ b/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>

diff --git a/src/Bullet.cpp b/src/Bullet.cpp
index 1f4ef6af95ac601c06b0014c3f2ee17516fd33d8..b3bf8e57cb4f802b1c67e4e50c5558bb71e9120b 100644 (file)
--- a/src/Bullet.cpp
+++ b/src/Bullet.cpp
@@ -18,6 +18,7 @@
 
 #include "Bullet.h"
 
+#include "support/docstring.h"
 #include "support/lassert.h"
 
 using namespace std;

diff --git a/src/Bullet.h b/src/Bullet.h
index 6a4f997acbc5c2523e0331b622a107839fda864f..8a6da2ac3406852ed5ecce2d5e758e8ce9a5e5ce 100644 (file)
--- a/src/Bullet.h
+++ b/src/Bullet.h
@@ -13,7 +13,7 @@
 #ifndef BULLET_H
 #define BULLET_H
 
-#include "support/docstring.h"
+#include "support/strfwd.h"
 
 
 namespace lyx {

diff --git a/src/Changes.cpp b/src/Changes.cpp
index 63bb021efeced935b10f40282b3e6527f1e84656..7e97a24d10e8ba854b86f170c404769b71faa793 100644 (file)
--- a/src/Changes.cpp
+++ b/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"

diff --git a/src/Compare.cpp b/src/Compare.cpp
index 490a2ec0bdeb461e7d79cbddce454596cff52d11..49bdac1bfa394b1b3f80dc936d0673bb5a605576 100644 (file)
--- a/src/Compare.cpp
+++ b/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;

diff --git a/src/Converter.cpp b/src/Converter.cpp
index 59604d312740f3f368ffdc8a7ddf686d4a2275fb..ada329e5d984639926404d783c6e1b9c33e681f4 100644 (file)
--- a/src/Converter.cpp
+++ b/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"

diff --git a/src/Converter.h b/src/Converter.h
index e9efa00f4fc37cfe9847f4f1f3aac9bccebd1a3c..914b8167dd3ca03d671c394b6842980dae0ca8e8 100644 (file)
--- a/src/Converter.h
+++ b/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>

diff --git a/src/CoordCache.cpp b/src/CoordCache.cpp
index 51f1c5e79aca189ee9586b3658b4b2267676dfcf..2a8132818590172998b99a35343ba58d78fdb88a 100644 (file)
--- a/src/CoordCache.cpp
+++ b/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"
 

diff --git a/src/Counters.cpp b/src/Counters.cpp
index 32968fca66193cb34298efcca83ca52e057c72b4..9d7cc23d6da59de339500f885b632b323001d8da 100644 (file)
--- a/src/Counters.cpp
+++ b/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"

diff --git a/src/Counters.h b/src/Counters.h
index 959a2f4133614ec2f0f576a6a8d998be76e52091..e411bbb26cd94b3bb148ebdb9d11bc39fa75bfdd 100644 (file)
--- a/src/Counters.h
+++ b/src/Counters.h
@@ -17,7 +17,7 @@
 
 #include "OutputEnums.h"
 
-#include "support/docstring.h"
+#include "support/strfwd.h"
 
 #include <map>
 #include <vector>

diff --git a/src/Cursor.cpp b/src/Cursor.cpp
index 0d68c8680787e7306799d2a02bf73655a6def302..7197b91cf26951477c8515f69915c3bc686dc0d5 100644 (file)
--- a/src/Cursor.cpp
+++ b/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"
 

diff --git a/src/CursorSlice.cpp b/src/CursorSlice.cpp
index 20a163449f8d687fd98a8a5d314fb0fcd176d53f..872a91110e7996ffa1eb194add86d38e347c6cf2 100644 (file)
--- a/src/CursorSlice.cpp
+++ b/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>

diff --git a/src/CutAndPaste.cpp b/src/CutAndPaste.cpp
index 772fa49b5ebc595a87bf9950058cd48899ddf1bf..ee3418dd65ce5eb0172783c53f970dc0650df8c8 100644 (file)
--- a/src/CutAndPaste.cpp
+++ b/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>

diff --git a/src/CutAndPaste.h b/src/CutAndPaste.h
index fe68be5e20f0cc2d6bb806048f20943c4a795629..fcbac19a8982f00ff7f156cdd3ab75af2d8e7763 100644 (file)
--- a/src/CutAndPaste.h
+++ b/src/CutAndPaste.h
@@ -16,7 +16,7 @@
 
 #include "DocumentClassPtr.h"
 
-#include "support/docstring.h"
+#include "support/strfwd.h"
 
 #include "insets/Inset.h"
 

diff --git a/src/DepTable.cpp b/src/DepTable.cpp
index f8058fee30174115745dafa10046ebf5da4c93bc..8b15ec745dedf64aaada71fef1a8a5183a2ea6c5 100644 (file)
--- a/src/DepTable.cpp
+++ b/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"
 

diff --git a/src/Encoding.cpp b/src/Encoding.cpp
index 4dcede47b5952b57fda3f53df6f2381015a12a03..c7ea237179e79c966c7a700cea998fa0dda8da05 100644 (file)
--- a/src/Encoding.cpp
+++ b/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"

diff --git a/src/Encoding.h b/src/Encoding.h
index 6a96843607621adc7519ddee6b8e9a5a80ccc167..e35f0fdad816b7b812da2cb573e54cbbd43d272e 100644 (file)
--- a/src/Encoding.h
+++ b/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>

diff --git a/src/ErrorList.h b/src/ErrorList.h
index 35294476dccdb4a27fdb198e8e01d25ee06dd89a..29cb03cfe6ace8d311290a8140c756855c36721a 100644 (file)
--- a/src/ErrorList.h
+++ b/src/ErrorList.h
@@ -14,8 +14,7 @@
 
 #include "TexRow.h"
 
-#include "support/docstring.h"
-#include "support/types.h"
+#include "support/strfwd.h"
 
 #include <vector>
 

diff --git a/src/FontList.cpp b/src/FontList.cpp
index c32666080df441c0c4026037b08aa0cde5f3122d..67fb8354b0617500c66cd4625398de501826b801 100644 (file)
--- a/src/FontList.cpp
+++ b/src/FontList.cpp
@@ -20,8 +20,6 @@
 
 #include "FontList.h"
 
-#include "support/lyxalgo.h"
-
 using namespace std;
 
 namespace lyx {

diff --git a/src/Format.h b/src/Format.h
index 495d9b1c8ba811df20ece3e526dd7385c787038b..44b3381441af0af17a3aafc7e173d86c2b7f58fa 100644 (file)
--- a/src/Format.h
+++ b/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 {

diff --git a/src/FuncRequest.cpp b/src/FuncRequest.cpp
index 2049210529f39226573334370379561a7da9d708..de93a9f5f3901d502441193bbe69aaf0ae0a337f 100644 (file)
--- a/src/FuncRequest.cpp
+++ b/src/FuncRequest.cpp
@@ -14,6 +14,7 @@
 #include "LyXAction.h"
 
 #include "support/debug.h"
+#include "support/docstring.h"
 #include "support/lstrings.h"
 
 #include <climits>

diff --git a/src/FuncRequest.h b/src/FuncRequest.h
index 42829ae8de26302df1f0e4702296953679e0dae7..6dfde4bfd7709b013456633f8f14ebe24c999a7c 100644 (file)
--- a/src/FuncRequest.h
+++ b/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"

diff --git a/src/FuncStatus.h b/src/FuncStatus.h
index 4a632dc870fa2345717a5deeac67d5807a4d77c1..aba6eb88a25f97b9dee92a08e3bca26114c73afa 100644 (file)
--- a/src/FuncStatus.h
+++ b/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 {

diff --git a/src/Graph.cpp b/src/Graph.cpp
index 036bb38857359e6d8a6f78b8c568b97ca6d8c89e..f78be287b28e15605ffdc3baa41367891f26d5f4 100644 (file)
--- a/src/Graph.cpp
+++ b/src/Graph.cpp
@@ -17,8 +17,6 @@
 #include "support/debug.h"
 #include "support/lassert.h"
 
-#include <algorithm>
-
 using namespace std;
 
 namespace lyx {

diff --git a/src/HunspellChecker.cpp b/src/HunspellChecker.cpp
index 015973e1f43b43825ff2ff0079563b995b661bfe..a85365271a64296af18a31a18ddb69e5cba29940 100644 (file)
--- a/src/HunspellChecker.cpp
+++ b/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>
 

diff --git a/src/LaTeX.cpp b/src/LaTeX.cpp
index e88184bc907e0819d306ad9427b0ec30bc6be4c4..b74b13254d7351618676944819a5a7ecff458c89 100644 (file)
--- a/src/LaTeX.cpp
+++ b/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"

diff --git a/src/LaTeX.h b/src/LaTeX.h
index b76ec1fd428c79f05e76541b73f9e6c957233c64..c57b03b830743cf649a17b622465f06fd49a22aa 100644 (file)
--- a/src/LaTeX.h
+++ b/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"
 

diff --git a/src/LaTeXFeatures.cpp b/src/LaTeXFeatures.cpp
index 616e24ab8c40e835e05548af780a7d6812e1b77a..347a3e04501113d6d1afb0cca100891d6eadb767 100644 (file)
--- a/src/LaTeXFeatures.cpp
+++ b/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"
 

diff --git a/src/LaTeXFeatures.h b/src/LaTeXFeatures.h
index af27b5c232617d7ad2406d67b5e6d41b985340d1..27edb1f6a89303f799dd3941bbe98c0a8076bb27 100644 (file)
--- a/src/LaTeXFeatures.h
+++ b/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>

diff --git a/src/Language.cpp b/src/Language.cpp
index 03146c358a9abd23dca444ace28a8ee912314c96..9ad7a9c217e7b7633899b9023945e9b125b64254 100644 (file)
--- a/src/Language.cpp
+++ b/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"

diff --git a/src/Language.h b/src/Language.h
index ad8badffbc363ac05aaddd0eaf29b05b19da51d2..0dba749d9b179361da7c6757a6a8831dc47fcbcf 100644 (file)
--- a/src/Language.h
+++ b/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>

diff --git a/src/LayoutFile.cpp b/src/LayoutFile.cpp
index 9c76e5bad0c9abaa9355899bcd8b55e151c90144..1ce04aa685974622ddfab01504b53f15047c9be7 100644 (file)
--- a/src/LayoutFile.cpp
+++ b/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"

diff --git a/src/Lexer.cpp b/src/Lexer.cpp
index 2711db49e153e321733fd7c799b011b326791580..b11bf4743a549c4044fcd94c288dd25ef178bbc4 100644 (file)
--- a/src/Lexer.cpp
+++ b/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>

diff --git a/src/Lexer.h b/src/Lexer.h
index 149cc7ddf2962bca6daaa6e3e131f1560ae51201..9568b6e19de63e7a8992d61513066280411cac87 100644 (file)
--- a/src/Lexer.h
+++ b/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.

diff --git a/src/LyX.cpp b/src/LyX.cpp
index 180c4d335bb23b45d1468d38322951267ef1da48..c1369bcde726e2fce39d35eb65427c47bd7813ab 100644 (file)
--- a/src/LyX.cpp
+++ b/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>

diff --git a/src/LyXRC.cpp b/src/LyXRC.cpp
index 59bdc70a58a6d87df9c0ee1e4cb2b350efd85d30..4fd5a287cafad9445c7f8640cb8217c501b19fc5 100644 (file)
--- a/src/LyXRC.cpp
+++ b/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"

diff --git a/src/MetricsInfo.cpp b/src/MetricsInfo.cpp
index c4caa75644a26e2a6c19d1096d2f338f4f9d37aa..15e772ea712b24b0320799d88f2533ac24dbfed7 100644 (file)
--- a/src/MetricsInfo.cpp
+++ b/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;

diff --git a/src/PDFOptions.cpp b/src/PDFOptions.cpp
index 1ec97fdbb546cfedd83e93225d9d0876791914d1..a3dd1f34e5b57e523cde903bab19e1eb57897e74 100644 (file)
--- a/src/PDFOptions.cpp
+++ b/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>

diff --git a/src/PDFOptions.h b/src/PDFOptions.h
index d74caf430e638c65cd353970b6bdc0f2554113df..4ab0d9e3ad7488c52d8f1d0943b5533e992894e6 100644 (file)
--- a/src/PDFOptions.h
+++ b/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

diff --git a/src/ParIterator.cpp b/src/ParIterator.cpp
index 1ddf3479860dc8d27d96302b3bf4f28ce32f44eb..0464839adba78de5a043a60cd7d7dc441952df60 100644 (file)
--- a/src/ParIterator.cpp
+++ b/src/ParIterator.cpp
@@ -12,7 +12,7 @@
 
 #include "ParIterator.h"
 
-#include "Paragraph.h"
+#include "CursorSlice.h"
 #include "Text.h"
 
 #include "insets/Inset.h"

diff --git a/src/ParIterator.h b/src/ParIterator.h
index a4e410b7e22c93764bd2cffc6c6f567887c1b5f2..288b0353feaf44d3d5dd219de593b0df5e130f52 100644 (file)
--- a/src/ParIterator.h
+++ b/src/ParIterator.h
@@ -21,6 +21,7 @@ namespace lyx {
 
 class Buffer;
 class Inset;
+class Paragraph;
 class ParagraphList;
 
 

diff --git a/src/Paragraph.cpp b/src/Paragraph.cpp
index f3dc50feb60886a47bd6aa0b4ada4153ae8013fd..98e051445e7cefd132b3209a060f883adb2eec5a 100644 (file)
--- a/src/Paragraph.cpp
+++ b/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"
 

diff --git a/src/Paragraph.h b/src/Paragraph.h
index 0752dfeb0a76b494d5282f0c9bb7d9e0fe2aa7a2..4812684c3de1788be93ac205ca954ee73c4a2f95 100644 (file)
--- a/src/Paragraph.h
+++ b/src/Paragraph.h
@@ -16,7 +16,6 @@
 #ifndef PARAGRAPH_H
 #define PARAGRAPH_H
 
-#include "FontEnums.h"
 #include "LayoutEnums.h"
 #include "SpellChecker.h"
 

diff --git a/src/ParagraphMetrics.cpp b/src/ParagraphMetrics.cpp
index 72b212b10cde88f924d0da585396452f8d2d6e2d..86a3144a1b1b5d78d9f151ad52758725cb14dbcf 100644 (file)
--- a/src/ParagraphMetrics.cpp
+++ b/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;

diff --git a/src/ParagraphParameters.cpp b/src/ParagraphParameters.cpp
index 90c8705e898d831d4b09feb34f8c7335a3c13410..6ef9224f2d885962f912de4c4707712de2aafa5d 100644 (file)
--- a/src/ParagraphParameters.cpp
+++ b/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>

diff --git a/src/ParagraphParameters.h b/src/ParagraphParameters.h
index b4608e0b3bf62936e6882da6c05fe00700ca8448..36eec30c481b39f21f11471763fe2bd77bdeeb88 100644 (file)
--- a/src/ParagraphParameters.h
+++ b/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;
 
 
 ///

diff --git a/src/PersonalWordList.cpp b/src/PersonalWordList.cpp
index 4d3292e3f582578c79567528cccca1032cc4af7b..ca61d8a17106f5577c9d66de2308eb52b4a7355e 100644 (file)
--- a/src/PersonalWordList.cpp
+++ b/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 {
 

diff --git a/src/Row.cpp b/src/Row.cpp
index f59b6e41afdd358485ef9ebfc414efb9482a6245..9ab7f110376c25e299bbf6167be797079ecc8538 100644 (file)
--- a/src/Row.cpp
+++ b/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;

diff --git a/src/RowPainter.h b/src/RowPainter.h
index d573cb8e5b98a34848ae0dcf557f38bddf448e0b..275ff92b510f0837c7c9c30a0e6b6c33dc96be82 100644 (file)
--- a/src/RowPainter.h
+++ b/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.

diff --git a/src/ServerSocket.cpp b/src/ServerSocket.cpp
index fd903ce18fa4f69898da1516ae4d2acb5b2b2602..3544235bba0340fd1e3e07b200d4195c1e5b9d82 100644 (file)
--- a/src/ServerSocket.cpp
+++ b/src/ServerSocket.cpp
@@ -18,7 +18,6 @@
 
 #include "DispatchResult.h"
 #include "FuncRequest.h"
-#include "LyX.h"
 #include "LyXAction.h"
 
 #include "frontends/Application.h"

diff --git a/src/TexRow.h b/src/TexRow.h
index 8edcd8eb16515146fb8230cc34dd548bcdf3f7d8..d6617bf6be2ae7b41f1fadeb4dba565939cfdadf 100644 (file)
--- a/src/TexRow.h
+++ b/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>

diff --git a/src/Text.cpp b/src/Text.cpp
index e4eb4abf101c3826d8541c987dccef14ab2b11fd..5d761ca134b6d25b23e35f8fbb18a65409db25d4 100644 (file)
--- a/src/Text.cpp
+++ b/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"

diff --git a/src/Text.h b/src/Text.h
index 3faccb8c59d0abb79413477a44ac868af69e832c..1c5d4397f495a070eadc152166dc003a520e75d8 100644 (file)
--- a/src/Text.h
+++ b/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.

diff --git a/src/Text2.cpp b/src/Text2.cpp
index ad5b8aaaa5c806d1464c4d6588d459babda98266..cf687f9e0966a0cb0403d83972587f147c50319f 100644 (file)
--- a/src/Text2.cpp
+++ b/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>
 

diff --git a/src/Text3.cpp b/src/Text3.cpp
index 1d3e44d3eb1813171ca8b2caa4bd1c509b65e2b8..cf2d701e7fb1af73d0e3a4fd03087bd9699d83c4 100644 (file)
--- a/src/Text3.cpp
+++ b/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"

diff --git a/src/TextClass.cpp b/src/TextClass.cpp
index 03a7624a9ac776f396f819859c39dc8cb646a64f..42169c1b5053c42ec0d755426ccb96c631571409 100644 (file)
--- a/src/TextClass.cpp
+++ b/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"

diff --git a/src/TextMetrics.cpp b/src/TextMetrics.cpp
index c7d9e18acbcaedf593076d9cea5c03ec82a2c02f..5cd7a603a05762228cb123d2e49013e8126dc378 100644 (file)
--- a/src/TextMetrics.cpp
+++ b/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>

diff --git a/src/TextMetrics.h b/src/TextMetrics.h
index 9e887f344f3c7858fdd6f72108f880088add516a..f7f30fa08ec865c1ef23fd6f25b3aea2ea1532c0 100644 (file)
--- a/src/TextMetrics.h
+++ b/src/TextMetrics.h
@@ -28,7 +28,6 @@ namespace lyx {
 class BufferView;
 class Cursor;
 class CursorSlice;
-class DocIterator;
 class MetricsInfo;
 class Text;
 

diff --git a/src/Thesaurus.cpp b/src/Thesaurus.cpp
index 86cbd65906476052fdbadc1b6c7913e7b85bb4da..ace03d79e9b4014db7ec26c4938a4242f114365a 100644 (file)
--- a/src/Thesaurus.cpp
+++ b/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>

diff --git a/src/Thesaurus.h b/src/Thesaurus.h
index 52987cdd1377fdea6bcf41ad4701e927590e1b98..9c13b044cb9ecf30980b0bbdb9b3073d0a046eb9 100644 (file)
--- a/src/Thesaurus.h
+++ b/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.
  */

diff --git a/src/TocBuilder.cpp b/src/TocBuilder.cpp
index deaace26c95ff463e6c2cde748e5ff90fb722ecf..dada6f0435f71fd1267d217c287d20c5ff4b907e 100644 (file)
--- a/src/TocBuilder.cpp
+++ b/src/TocBuilder.cpp
@@ -12,6 +12,7 @@
 
 #include "TocBuilder.h"
 
+#include "DocIterator.h"
 #include "TocBackend.h"
 
 #include "support/lassert.h"

diff --git a/src/TocBuilder.h b/src/TocBuilder.h
index da016a632fd6034364816ff25096d36bfb712b1a..5c3407918a4d61eec983804c1991b10545547aea 100644 (file)
--- a/src/TocBuilder.h
+++ b/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

diff --git a/src/Trans.cpp b/src/Trans.cpp
index 02c8f864ab62c7eebc736bcb2350be7b05ba5d8a..5a0366568481965f9e97ee95258f9a7363d18161 100644 (file)
--- a/src/Trans.cpp
+++ b/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"

diff --git a/src/Undo.cpp b/src/Undo.cpp
index da4d27ca03d457f5172215b0d589c07689952107..670449035202e480137b3d7f77a882b0ae4d3c00 100644 (file)
--- a/src/Undo.cpp
+++ b/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"
 

diff --git a/src/Undo.h b/src/Undo.h
index 8b482d2582446c13d1399a1997284b712051e7d3..887f7627e1d54854800a34c00678971f77d1f63e 100644 (file)
--- a/src/Undo.h
+++ b/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 {

diff --git a/src/VCBackend.cpp b/src/VCBackend.cpp
index 309d705372728a30dbf51d0360d23bc58ca76c00..bee398cc4eb6dc4cd866b3cb7c7c5f1bd74e38b2 100644 (file)
--- a/src/VCBackend.cpp
+++ b/src/VCBackend.cpp
@@ -13,7 +13,6 @@
 
 #include "VCBackend.h"
 #include "Buffer.h"
-#include "DispatchResult.h"
 #include "LyX.h"
 #include "FuncRequest.h"
 

diff --git a/src/VSpace.cpp b/src/VSpace.cpp
index d176850c876d48fd64e261deab215c1f9ae7fb29..abec3eff92569101a4db227f77c69417d6b65ba8 100644 (file)
--- a/src/VSpace.cpp
+++ b/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"

diff --git a/src/factory.cpp b/src/factory.cpp
index 0cd3a4ca0a62c8bb6331a543d6c30f30433c5a2d..dd72fe33d15359487ad22be478ebd9292331463d 100644 (file)
--- a/src/factory.cpp
+++ b/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"
 

diff --git a/src/insets/InsetText.cpp b/src/insets/InsetText.cpp
index 10b15c88edad34abd39a31fb90b9223ff2700e91..6f7a1a40e5a705c246989deb4123fa935de52b80 100644 (file)
--- a/src/insets/InsetText.cpp
+++ b/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;

diff --git a/src/lyxfind.cpp b/src/lyxfind.cpp
index e12d4d239a84ec9f691a961f35b3456186cd886a..54683b0db32573e24d6790092f9bf23e4d4d700a 100644 (file)
--- a/src/lyxfind.cpp
+++ b/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"
 

diff --git a/src/lyxfind.h b/src/lyxfind.h
index bfaae8f43d96d6bfdda818cabdda8637eafd7fdc..9daf4c8d74e560433d1ba11c01c3a04175562afe 100644 (file)
--- a/src/lyxfind.h
+++ b/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.

diff --git a/src/output_xhtml.cpp b/src/output_xhtml.cpp
index d428761b10a1f1fe84267e0b0338361631117290..a4aced68b0ac480bc2dc7d42a877d04deef30ce6 100644 (file)
--- a/src/output_xhtml.cpp
+++ b/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>