Cleanup headers

src/LaTeXFeatures.cpp

@@ -28,6 +28,7 @@
 #include "LaTeXPackages.h"
 #include "Layout.h"
 #include "LyXRC.h"
+#include "OutputParams.h"
 #include "TextClass.h"
 #include "TexRow.h"
 #include "texstream.h"

src/LaTeXFeatures.h

@@ -13,12 +13,12 @@
 #ifndef LATEXFEATURES_H
 #define LATEXFEATURES_H
 
-#include "OutputParams.h"
 #include "support/strfwd.h"
 
 #include <set>
 #include <list>
 #include <map>
+#include <vector>
 
 
 namespace lyx {
@@ -27,6 +27,8 @@ class Buffer;
 class BufferParams;
 class InsetLayout;
 class Language;
+class otexstream;
+class OutputParams;
 struct TexString;
 
 /** The packages and commands that a buffer needs. This class

src/LyX.cpp

@@ -38,7 +38,6 @@
 #include "Language.h"
 #include "LaTeXFonts.h"
 #include "LayoutFile.h"
-#include "LyX.h"
 #include "LyXAction.h"
 #include "LyXRC.h"
 #include "ModuleList.h"

src/frontends/Clipboard.h

@@ -14,13 +14,14 @@
 #ifndef BASE_CLIPBOARD_H
 #define BASE_CLIPBOARD_H
 
-#include "support/FileName.h"
 #include "support/strfwd.h"
 
 namespace lyx {
 
 class Cursor;
 
+namespace support { class FileName; }
+
 namespace frontend {
 
 /**

src/frontends/qt/GuiBox.h

@@ -15,7 +15,6 @@
 
 #include "InsetParamsWidget.h"
 #include "ui_BoxUi.h"
-#include "Font.h"
 
 namespace lyx {
 namespace frontend {

src/frontends/qt/GuiChanges.cpp

@@ -15,10 +15,6 @@
 
 #include "qt_helpers.h"
 
-#include "support/gettext.h"
-#include "support/lstrings.h"
-#include "support/lyxtime.h"
-
 #include "Author.h"
 #include "Buffer.h"
 #include "BufferParams.h"
@@ -27,7 +23,6 @@
 #include "Cursor.h"
 #include "FuncRequest.h"
 #include "LyXRC.h"
-#include "Text.h"
 
 #include <QDateTime>
 #include <QTextBrowser>

src/frontends/qt/GuiChanges.h

@@ -17,8 +17,6 @@
 #include "ui_ChangesUi.h"
 
 #include "support/debug.h"
-#include "support/docstring.h"
-
 
 namespace lyx {
 namespace frontend {

src/frontends/qt/GuiCharacter.cpp

@@ -30,7 +30,6 @@
 #include "Paragraph.h"
 
 #include "support/gettext.h"
-#include "support/lstrings.h"
 
 #include <QAbstractItemModel>
 #include <QPushButton>

src/frontends/qt/GuiCounter.cpp

@@ -12,6 +12,7 @@
 
 #include "GuiCounter.h"
 
+#include "GuiView.h"
 #include "qt_helpers.h"
 
 #include "Buffer.h"
@@ -22,6 +23,7 @@
 #include "insets/InsetCommandParams.h"
 
 #include "support/convert.h"
+#include "support/debug.h"
 #include "support/gettext.h"
 #include "support/lstrings.h"
 

src/frontends/qt/GuiCounter.h

@@ -14,13 +14,14 @@
 
 #include "InsetParamsWidget.h"
 #include "ui_CounterUi.h"
-#include "GuiView.h"
 
 namespace lyx {
 class InsetCommandParams;
 
 namespace frontend {
 
+class GuiView;
+
 class GuiCounter : public InsetParamsWidget, public Ui::CounterUi
 {
 	Q_OBJECT

src/insets/InsetCommand.cpp

@@ -44,7 +44,6 @@
 #include "insets/InsetWrap.h"
 
 #include "support/debug.h"
-#include "support/gettext.h"
 #include "support/lstrings.h"
 
 #include "frontends/Application.h"

src/insets/InsetCommandParams.h

@@ -16,8 +16,6 @@
 
 #include "InsetCode.h"
 
-#include "OutputParams.h"
-
 #include "support/docstring.h"
 
 #include <string>
@@ -27,8 +25,9 @@
 
 namespace lyx {
 
-class Lexer;
 class Buffer;
+class Lexer;
+class OutputParams;
 
 class ParamInfo {
 public:

src/insets/InsetERT.cpp

@@ -13,17 +13,11 @@
 
 #include "InsetERT.h"
 
-#include "Buffer.h"
-#include "BufferParams.h"
-#include "BufferView.h"
 #include "Cursor.h"
-#include "DispatchResult.h"
 #include "FuncRequest.h"
 #include "FuncStatus.h"
 #include "Language.h"
-#include "Layout.h"
 #include "Lexer.h"
-#include "LyXAction.h"
 #include "OutputParams.h"
 #include "xml.h"
 #include "ParagraphParameters.h"

src/insets/InsetHyperlink.cpp

@@ -13,8 +13,6 @@
 #include "InsetHyperlink.h"
 
 #include "Buffer.h"
-#include "DispatchResult.h"
-#include "Encoding.h"
 #include "Format.h"
 #include "FuncRequest.h"
 #include "FuncStatus.h"
@@ -25,6 +23,7 @@
 #include "xml.h"
 #include "texstream.h"
 
+#include "support/debug.h"
 #include "support/docstream.h"
 #include "support/FileName.h"
 #include "support/filetools.h"

src/insets/InsetPreview.cpp

@@ -15,6 +15,7 @@
 #include "BufferParams.h"
 #include "BufferView.h"
 #include "Cursor.h"
+#include "Dimension.h"
 #include "Lexer.h"
 #include "MetricsInfo.h"
 #include "OutputParams.h"

src/insets/InsetPreview.h

@@ -14,13 +14,12 @@
 
 #include "InsetText.h"
 
-#include "Dimension.h"
-
 #include "support/unique_ptr.h"
 
 
 namespace lyx {
 
+class Dimension;
 class RenderPreview;
 
 namespace graphics {

src/insets/InsetText.cpp

@@ -44,7 +44,6 @@
 #include "Paragraph.h"
 #include "ParagraphParameters.h"
 #include "ParIterator.h"
-#include "Row.h"
 #include "TexRow.h"
 #include "texstream.h"
 #include "TextClass.h"

src/mathed/InsetMathXArrow.cpp

@@ -10,8 +10,6 @@
 
 #include <config.h>
 
-#include "support/lassert.h"
-
 #include "InsetMathXArrow.h"
 
 #include "MathData.h"
@@ -21,6 +19,8 @@
 #include "LaTeXFeatures.h"
 #include "MetricsInfo.h"
 
+#include "support/debug.h"
+#include "support/lassert.h"
 
 #include <algorithm>
 

src/mathed/MathData.cpp

@@ -27,6 +27,7 @@
 #include "BufferView.h"
 #include "CoordCache.h"
 #include "Cursor.h"
+#include "Dimension.h"
 
 #include "mathed/InsetMathUnknown.h"
 

src/mathed/MathData.h

@@ -15,8 +15,6 @@
 #ifndef MATH_DATA_H
 #define MATH_DATA_H
 
-#include "Dimension.h"
-
 #include "MathAtom.h"
 #include "MathRow.h"
 
@@ -33,6 +31,7 @@ namespace lyx {
 class Buffer;
 class BufferView;
 class Cursor;
+class Dimension;
 class DocIterator;
 class LaTeXFeatures;
 class ReplaceData;

src/mathed/MathRow.h

@@ -25,7 +25,6 @@
 namespace lyx {
 
 class BufferView;
-class Dimension;
 class MathData;
 class MetricsInfo;
 class PainterInfo;

src/mathed/MathStream.cpp

@@ -18,6 +18,8 @@
 
 #include "TexRow.h"
 
+
+#include "support/debug.h"
 #include "support/docstring.h"
 #include "support/textutils.h"
 

src/mathed/MathStream.h

@@ -19,7 +19,6 @@
 
 #include "support/Changer.h"
 #include "support/strfwd.h"
-#include "support/unique_ptr.h"
 
 
 namespace lyx {

src/output_docbook.cpp

@@ -31,6 +31,7 @@
 #include "mathed/InsetMath.h"
 #include "insets/InsetNote.h"
 
+#include "support/debug.h"
 #include "support/lassert.h"
 #include "support/textutils.h"
 

src/support/lyxmagic.h

@@ -12,12 +12,12 @@
 #ifndef LYX_MAGIC_H
 #define LYX_MAGIC_H
 
+#include "support/debug.h"
+
 namespace lyx {
 
 #ifdef HAVE_MAGIC_H
 
-#include "support/debug.h"
-
 #include <magic.h>
 
 class Magic {

src/tests/check_layout.cpp

@@ -1,5 +1,6 @@
 #include <config.h>
 
+#include "../support/debug.h"
 #include "../support/FileName.h"
 #include "../support/filetools.h"
 #include "../Format.h"

src/tex2lyx/Parser.cpp

@@ -10,8 +10,9 @@
 
 #include <config.h>
 
-#include "Encoding.h"
 #include "Parser.h"
+
+#include "Encoding.h"
 #include "support/lstrings.h"
 #include "support/textutils.h"
 

src/tex2lyx/Preamble.cpp

@@ -18,7 +18,6 @@
 
 #include "Encoding.h"
 #include "LayoutFile.h"
-#include "Layout.h"
 #include "Lexer.h"
 #include "TextClass.h"
 #include "version.h"

src/tex2lyx/tex2lyx.cpp

@@ -26,6 +26,7 @@
 
 #include "support/ConsoleApplication.h"
 #include "support/convert.h"
+#include "support/debug.h"
 #include "support/ExceptionMessage.h"
 #include "support/filetools.h"
 #include "support/lassert.h"

src/xml.cpp

@@ -23,6 +23,7 @@
 #include "TextClass.h"
 
 #include "support/convert.h"
+#include "support/debug.h"
 #include "support/docstream.h"
 #include "support/lassert.h"
 #include "support/lstrings.h"