Reduce includes in header files

src/BiblioInfo.h

@@ -17,8 +17,6 @@
 
 #include "support/docstring.h"
 
-#include "Citation.h"
-
 #include <map>
 #include <set>
 #include <vector>
@@ -28,6 +26,8 @@ namespace lyx {
 
 class Buffer;
 class BufferParams;
+class CitationStyle;
+class CiteItem;
 class XMLStream;
 
 /// \param latex_str a LaTeX command, "cite", "Citep*", etc

src/Buffer.h

@@ -17,7 +17,6 @@
 #include "support/unique_ptr.h"
 #include "support/strfwd.h"
 #include "support/types.h"
-#include "support/FileNameList.h"
 
 #include <map>
 #include <list>
@@ -66,6 +65,7 @@ class WorkAreaManager;
 namespace support {
 class DocFileName;
 class FileName;
+class FileNameList;
 } // namespace support
 
 namespace graphics {

src/BufferView.h

@@ -46,7 +46,6 @@ class MathData;
 class MathRow;
 class ParagraphMetrics;
 class Point;
-class TexRow;
 class Text;
 class TextMetrics;
 

src/CiteEnginesList.cpp

@@ -14,7 +14,6 @@
 
 #include "CiteEnginesList.h"
 
-#include "Citation.h"
 #include "LaTeXFeatures.h"
 #include "Lexer.h"
 

src/CmdDef.cpp

@@ -12,6 +12,7 @@
 
 #include "CmdDef.h"
 
+#include "FuncRequest.h"
 #include "LyXAction.h"
 #include "Lexer.h"
 

src/CmdDef.h

@@ -12,8 +12,6 @@
 #ifndef CMDDEF_H
 #define CMDDEF_H
 
-#include "FuncRequest.h"
-
 #include "support/strfwd.h"
 
 #include <map>
@@ -21,6 +19,8 @@
 
 namespace lyx {
 
+class FuncRequest;
+
 /// Creates command definitions
 class CmdDef {
 private:

src/Compare.cpp

@@ -13,6 +13,7 @@
 #include "Compare.h"
 
 #include "Author.h"
+#include "Buffer.h"
 #include "BufferParams.h"
 #include "Changes.h"
 #include "CutAndPaste.h"

src/Compare.h

@@ -12,8 +12,6 @@
 #ifndef COMPARE_H
 #define COMPARE_H
 
-#include "Buffer.h"
-
 #include <QObject>
 #include <QThread>
 #include <QTimer>
@@ -22,6 +20,8 @@
 
 namespace lyx {
 
+class Buffer;
+
 /**
  * The options that are used by the Comparison algorithm
  * and are set in the GuiCompare Dialog.

src/DepTable.cpp

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

src/DepTable.h

@@ -13,14 +13,15 @@
 #ifndef DEP_TABLE_H
 #define DEP_TABLE_H
 
-#include "support/FileName.h"
-
+#include <ctime>
 #include <map>
 #include <string>
 
 
 namespace lyx {
 
+namespace support { class FileName; }
+
 ///
 class DepTable {
 public:

src/LayoutFile.h

@@ -13,7 +13,6 @@
 #ifndef BASECLASSLIST_H
 #define BASECLASSLIST_H
 
-#include "LayoutModuleList.h"
 #include "TextClass.h"
 
 #include "support/strfwd.h"
@@ -24,6 +23,8 @@
 
 namespace lyx {
 
+class LayoutModuleList;
+
 /// Index into LayoutFileList. Basically a 'strong typedef'.
 class LayoutFileIndex {
 public:

src/Text.h

@@ -33,6 +33,7 @@ class FontInfo;
 class FuncRequest;
 class FuncStatus;
 class Inset;
+class InsetText;
 class Lexer;
 class PainterInfo;
 class Spacing;

src/TextClass.h

@@ -15,7 +15,6 @@
 #include "DocumentClassPtr.h"
 #include "FloatList.h"
 #include "FontInfo.h"
-#include "Layout.h"
 #include "LayoutEnums.h"
 #include "LayoutModuleList.h"
 
@@ -38,7 +37,6 @@ namespace lyx {
 
 namespace support { class FileName; }
 
-class Counters;
 class FloatList;
 class Layout;
 class LayoutFile;

src/buffer_funcs.cpp

@@ -22,6 +22,7 @@
 #include "support/lassert.h"
 #include "support/convert.h"
 #include "support/debug.h"
+#include "support/FileName.h"
 #include "support/filetools.h"
 #include "support/gettext.h"
 #include "support/lstrings.h"