Reduce includes in header files

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

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

diff --git a/src/BufferView.h b/src/BufferView.h
index 22f0d927650cc5f1599c1fc82857bb416600c911..74e29c6424681ff0048a9dc660bb8768acd0659f 100644 (file)
--- a/src/BufferView.h
+++ b/src/BufferView.h
@@ -46,7 +46,6 @@ class MathData;
 class MathRow;
 class ParagraphMetrics;
 class Point;
-class TexRow;
 class Text;
 class TextMetrics;
 

diff --git a/src/CiteEnginesList.cpp b/src/CiteEnginesList.cpp
index 7d7ad3f7dfdaf5ed8fbaa5457091b4ed404a5152..aeb60dd56a831583c5f7962cd7cc333232df2721 100644 (file)
--- a/src/CiteEnginesList.cpp
+++ b/src/CiteEnginesList.cpp
@@ -14,7 +14,6 @@
 
 #include "CiteEnginesList.h"
 
-#include "Citation.h"
 #include "LaTeXFeatures.h"
 #include "Lexer.h"
 

diff --git a/src/CmdDef.cpp b/src/CmdDef.cpp
index 8a480bd4df01678756cc771e3a2bc7bda8b858ab..08cd7dd6a928e01812904f2eb4e854bbfc97f2e0 100644 (file)
--- a/src/CmdDef.cpp
+++ b/src/CmdDef.cpp
@@ -12,6 +12,7 @@
 
 #include "CmdDef.h"
 
+#include "FuncRequest.h"
 #include "LyXAction.h"
 #include "Lexer.h"
 

diff --git a/src/CmdDef.h b/src/CmdDef.h
index 5fb6e366b6d3d9347ea2c923060339462eee2de0..946730e64e44ffee41b8325c9395fde303369469 100644 (file)
--- a/src/CmdDef.h
+++ b/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:

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

diff --git a/src/Compare.h b/src/Compare.h
index 40ecf5c23aec832a42f3108782bfb9a2a2609341..1c93fb58cee64c17ca8f0a1dfd7ce3a58ecee5c4 100644 (file)
--- a/src/Compare.h
+++ b/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.

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

diff --git a/src/DepTable.h b/src/DepTable.h
index 0d78ab8f5365fa4552b32a92027d842a120aec77..13498b7593b2203beb60a13d73e1b3311d7778d9 100644 (file)
--- a/src/DepTable.h
+++ b/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:

diff --git a/src/LayoutFile.h b/src/LayoutFile.h
index fe865322667ed83b3500ba7af7d1a13aaaf0f781..81dff9de78d39e9eef4dca1d374691c3d0c52a05 100644 (file)
--- a/src/LayoutFile.h
+++ b/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:

diff --git a/src/Text.h b/src/Text.h
index 723e66b80daa65120e8ad79f14a56f83008acfed..3faccb8c59d0abb79413477a44ac868af69e832c 100644 (file)
--- a/src/Text.h
+++ b/src/Text.h
@@ -33,6 +33,7 @@ class FontInfo;
 class FuncRequest;
 class FuncStatus;
 class Inset;
+class InsetText;
 class Lexer;
 class PainterInfo;
 class Spacing;

diff --git a/src/TextClass.h b/src/TextClass.h
index 5314f391fbfa218e10bbe3e28189eb4509f655ef..741bf33d8fe371da34f1feca6ad5213bc79b07ff 100644 (file)
--- a/src/TextClass.h
+++ b/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;

diff --git a/src/buffer_funcs.cpp b/src/buffer_funcs.cpp
index 8ac7e9736072598617a2d7dc1f0569e19445b4e8..58aa12d99aa6b15e4351b9386339238f15acb2ce 100644 (file)
--- a/src/buffer_funcs.cpp
+++ b/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"