Reduce includes in header files (2)

diff --git a/src/BiblioInfo.cpp b/src/BiblioInfo.cpp
index 15705ce14488f8dc1ac8143e91d13ecc91163e16..486bd5c1e51d652c2f3265fda33626786754da5c 100644 (file)
--- a/src/BiblioInfo.cpp
+++ b/src/BiblioInfo.cpp
@@ -30,6 +30,7 @@
 #include "support/convert.h"
 #include "support/debug.h"
 #include "support/docstream.h"
 #include "support/convert.h"
 #include "support/debug.h"
 #include "support/docstream.h"

+#include "support/FileName.h"

 #include "support/gettext.h"
 #include "support/lassert.h"
 #include "support/lstrings.h"
 #include "support/gettext.h"
 #include "support/lassert.h"
 #include "support/lstrings.h"

diff --git a/src/frontends/Application.h b/src/frontends/Application.h
index 5e3b37a7f11fa8529285d5da2940722185f71985..59806c0428c079d80a759dd541c11456e95b0fe7 100644 (file)
--- a/src/frontends/Application.h
+++ b/src/frontends/Application.h
@@ -14,8 +14,6 @@
 #include "ColorCode.h"
 #include "FuncCode.h"
 
 #include "ColorCode.h"
 #include "FuncCode.h"
 

-#include "KeyModifier.h"
-

 #include "support/strfwd.h"
 
 #include <functional>
 #include "support/strfwd.h"
 
 #include <functional>

diff --git a/src/frontends/qt/ColorCache.cpp b/src/frontends/qt/ColorCache.cpp
index 81ac1387e5d738d8d534d9e119a7467154ff0cac..1b876410a8d9dfbecac848b82b634d2e15516b32 100644 (file)
--- a/src/frontends/qt/ColorCache.cpp
+++ b/src/frontends/qt/ColorCache.cpp
@@ -10,9 +10,11 @@
 
 #include <config.h>
 
 
 #include <config.h>
 

+#include "ColorCache.h"
+

 #include "LyXRC.h"
 
 #include "LyXRC.h"
 

-#include "ColorCache.h"
+#include "Color.h"

 #include "ColorSet.h"
 
 namespace lyx {
 #include "ColorSet.h"
 
 namespace lyx {

diff --git a/src/frontends/qt/ColorCache.h b/src/frontends/qt/ColorCache.h
index e1ad6aed5eaea665ca46ec07f6d2bb0b977cc111..beb680f7cdde34bf78686d31efeaa29cb80db1ea 100644 (file)
--- a/src/frontends/qt/ColorCache.h
+++ b/src/frontends/qt/ColorCache.h
@@ -12,14 +12,14 @@
 #ifndef COLORCACHE_H
 #define COLORCACHE_H
 
 #ifndef COLORCACHE_H
 #define COLORCACHE_H
 

-#include "Color.h"
+#include "ColorCode.h"

 
 #include <QColor>
 #include <QPalette>
 
 namespace lyx {
 
 
 #include <QColor>
 #include <QPalette>
 
 namespace lyx {
 

-struct RGBColor;
+class Color;

 
 /**
  * Cache from Color to QColor.
 
 /**
  * Cache from Color to QColor.

diff --git a/src/frontends/qt/FindAndReplace.h b/src/frontends/qt/FindAndReplace.h
index 4456c653a9975b27b8c51851d5fba15d53b4ace9..169530a516702f63c1555f971e9b613b4af62a75 100644 (file)
--- a/src/frontends/qt/FindAndReplace.h
+++ b/src/frontends/qt/FindAndReplace.h
@@ -17,11 +17,12 @@
 #include "qt_helpers.h"
 #include "ui_FindAndReplaceUi.h"
 
 #include "qt_helpers.h"
 #include "ui_FindAndReplaceUi.h"
 

-#include "lyxfind.h"
-

 #include <string>
 
 namespace lyx {
 #include <string>
 
 namespace lyx {

+
+class FindAndReplaceOptions;
+

 namespace frontend {
 
 class FindAndReplaceWidget : public QTabWidget, public Ui::FindAndReplaceUi
 namespace frontend {
 
 class FindAndReplaceWidget : public QTabWidget, public Ui::FindAndReplaceUi

diff --git a/src/frontends/qt/GuiApplication.h b/src/frontends/qt/GuiApplication.h
index a121b957a67753a9b4278cab5da050deb96351c0..d1294e679846624ff86940e2bf10d95b3aad138c 100644 (file)
--- a/src/frontends/qt/GuiApplication.h
+++ b/src/frontends/qt/GuiApplication.h
@@ -13,6 +13,8 @@
 #ifndef GUIAPPLICATION_H
 #define GUIAPPLICATION_H
 
 #ifndef GUIAPPLICATION_H
 #define GUIAPPLICATION_H
 

+#include "KeyModifier.h"
+

 #include "frontends/Application.h"
 #include "support/filetools.h"
 
 #include "frontends/Application.h"
 #include "support/filetools.h"
 

diff --git a/src/frontends/qt/GuiBibtex.cpp b/src/frontends/qt/GuiBibtex.cpp
index c0c33a58a686088c9bbda1fef470fdb339de7f12..8c561ccf85569fbc96edae7d28bc4aea5a73bf0f 100644 (file)
--- a/src/frontends/qt/GuiBibtex.cpp
+++ b/src/frontends/qt/GuiBibtex.cpp
@@ -27,6 +27,7 @@
 #include "Validator.h"
 
 #include "ButtonPolicy.h"
 #include "Validator.h"
 
 #include "ButtonPolicy.h"

+#include "FancyLineEdit.h"

 
 #include "frontends/alert.h"
 
 
 #include "frontends/alert.h"
 

diff --git a/src/frontends/qt/GuiBibtex.h b/src/frontends/qt/GuiBibtex.h
index cb174990801dd7f742e6c18fed1c91ac1dd3df39..2258ec9d167de4e9953c1b425c45e11d21dfe15b 100644 (file)
--- a/src/frontends/qt/GuiBibtex.h
+++ b/src/frontends/qt/GuiBibtex.h
@@ -16,7 +16,6 @@
 #include "GuiDialog.h"
 #include "GuiSelectionManager.h"
 #include "ButtonController.h"
 #include "GuiDialog.h"
 #include "GuiSelectionManager.h"
 #include "ButtonController.h"

-#include "FancyLineEdit.h"

 #include "ui_BibtexUi.h"
 
 #include "insets/InsetCommandParams.h"
 #include "ui_BibtexUi.h"
 
 #include "insets/InsetCommandParams.h"


@@ -27,6 +26,8 @@
 namespace lyx {
 namespace frontend {
 
 namespace lyx {
 namespace frontend {
 

+class FancyLineEdit;
+

 class GuiBibtex : public GuiDialog, public Ui::BibtexUi
 {
        Q_OBJECT
 class GuiBibtex : public GuiDialog, public Ui::BibtexUi
 {
        Q_OBJECT

diff --git a/src/frontends/qt/GuiCitation.cpp b/src/frontends/qt/GuiCitation.cpp
index d7e5ae0199959bff3a3d7f41b6597995eb1910dc..195b0d349bda67d8f599f9314f6c4f2cba8024ce 100644 (file)
--- a/src/frontends/qt/GuiCitation.cpp
+++ b/src/frontends/qt/GuiCitation.cpp
@@ -16,6 +16,7 @@
 
 #include "GuiCitation.h"
 
 
 #include "GuiCitation.h"
 

+#include "FancyLineEdit.h"

 #include "GuiApplication.h"
 #include "GuiSelectionManager.h"
 #include "qt_helpers.h"
 #include "GuiApplication.h"
 #include "GuiSelectionManager.h"
 #include "qt_helpers.h"


@@ -23,6 +24,7 @@
 #include "Buffer.h"
 #include "BufferView.h"
 #include "BufferParams.h"
 #include "Buffer.h"
 #include "BufferView.h"
 #include "BufferParams.h"

+#include "Citation.h"

 #include "TextClass.h"
 #include "FuncRequest.h"
 
 #include "TextClass.h"
 #include "FuncRequest.h"
 

diff --git a/src/frontends/qt/GuiCitation.h b/src/frontends/qt/GuiCitation.h
index 7e65fe64cb4a342c0fddc1343b5cca0933920004..13a808763cfb6c6d72bb1dd71725dc2137fe3ff7 100644 (file)
--- a/src/frontends/qt/GuiCitation.h
+++ b/src/frontends/qt/GuiCitation.h
@@ -17,12 +17,10 @@
 
 #include "DialogView.h"
 #include "ui_CitationUi.h"
 
 #include "DialogView.h"
 #include "ui_CitationUi.h"

-#include "FancyLineEdit.h"

 
 #include "insets/InsetCommandParams.h"
 
 #include "BiblioInfo.h"
 
 #include "insets/InsetCommandParams.h"
 
 #include "BiblioInfo.h"

-#include "Citation.h"

 
 #include <QAbstractListModel>
 #include <QStandardItemModel>
 
 #include <QAbstractListModel>
 #include <QStandardItemModel>


@@ -31,8 +29,11 @@
 
 namespace lyx {
 
 
 namespace lyx {
 

+class CitationStyle;
+

 namespace frontend {
 
 namespace frontend {
 

+class FancyLineEdit;

 class GuiSelectionManager;
 
 
 class GuiSelectionManager;
 
 

diff --git a/src/frontends/qt/GuiDocument.cpp b/src/frontends/qt/GuiDocument.cpp
index 883b283629b39fa644008bb2e84c2a7060532e6d..d691cc7bd88331c9022f0932e99e8ab973245cd7 100644 (file)
--- a/src/frontends/qt/GuiDocument.cpp
+++ b/src/frontends/qt/GuiDocument.cpp
@@ -13,7 +13,9 @@
 
 #include "GuiDocument.h"
 
 
 #include "GuiDocument.h"
 

+#include "BulletsModule.h"

 #include "CategorizedCombo.h"
 #include "CategorizedCombo.h"

+#include "FancyLineEdit.h"

 #include "GuiApplication.h"
 #include "GuiBranches.h"
 #include "GuiIndices.h"
 #include "GuiApplication.h"
 #include "GuiBranches.h"
 #include "GuiIndices.h"

diff --git a/src/frontends/qt/GuiDocument.h b/src/frontends/qt/GuiDocument.h
index 73cc4d6b8b87361de6d256083586b4f5f0b254fb..52da41300e6044143906fbab6999ea645389dbd9 100644 (file)
--- a/src/frontends/qt/GuiDocument.h
+++ b/src/frontends/qt/GuiDocument.h
@@ -14,7 +14,6 @@
 #define GUIDOCUMENT_H
 
 #include "BufferParams.h"
 #define GUIDOCUMENT_H
 
 #include "BufferParams.h"

-#include "BulletsModule.h"

 #include "GuiDialog.h"
 #include "GuiIdListModel.h"
 
 #include "GuiDialog.h"
 #include "GuiIdListModel.h"
 


@@ -51,6 +50,8 @@ namespace support {
 
 namespace frontend {
 
 
 namespace frontend {
 

+class BulletsModule;
+class FancyLineEdit;

 class FloatPlacement;
 class GuiBranches;
 class GuiIndices;
 class FloatPlacement;
 class GuiBranches;
 class GuiIndices;

diff --git a/src/frontends/qt/GuiLyXFiles.cpp b/src/frontends/qt/GuiLyXFiles.cpp
index f54c56bc9a95c97300db9ed5456f513623dc53f3..5616ac0c2d556eb09bc3e6e0b0a9e12a2c7a8bd7 100644 (file)
--- a/src/frontends/qt/GuiLyXFiles.cpp
+++ b/src/frontends/qt/GuiLyXFiles.cpp
@@ -15,14 +15,11 @@
 #include "qt_helpers.h"
 
 #include "FileDialog.h"
 #include "qt_helpers.h"
 
 #include "FileDialog.h"

-#include "Buffer.h"
-#include "BufferParams.h"

 #include "FuncRequest.h"
 #include "Language.h"
 #include "LyXRC.h"
 
 #include "support/environment.h"
 #include "FuncRequest.h"
 #include "Language.h"
 #include "LyXRC.h"
 
 #include "support/environment.h"

-#include "support/filetools.h"

 #include "support/gettext.h"
 #include "support/lstrings.h"
 #include "support/Messages.h"
 #include "support/gettext.h"
 #include "support/lstrings.h"
 #include "support/Messages.h"

diff --git a/src/frontends/qt/GuiPrefs.cpp b/src/frontends/qt/GuiPrefs.cpp
index 50760ed13af3c7d33658bd8c773eb3cde319367c..faf88039bbd53a32f1ee5c7c63a608255ee948f1 100644 (file)
--- a/src/frontends/qt/GuiPrefs.cpp
+++ b/src/frontends/qt/GuiPrefs.cpp
@@ -19,6 +19,7 @@
 #include "GuiFontExample.h"
 #include "GuiFontLoader.h"
 #include "GuiKeySymbol.h"
 #include "GuiFontExample.h"
 #include "GuiFontLoader.h"
 #include "GuiKeySymbol.h"

+#include "GuiLyXFiles.h"

 #include "GuiView.h"
 #include "qt_helpers.h"
 #include "Validator.h"
 #include "GuiView.h"
 #include "qt_helpers.h"
 #include "Validator.h"

diff --git a/src/frontends/qt/GuiPrefs.h b/src/frontends/qt/GuiPrefs.h
index 90cf142185f0fb3f11738a26053a703f2ba0f9e5..11a511db2eafeb961d080d6d00652e9491743035 100644 (file)
--- a/src/frontends/qt/GuiPrefs.h
+++ b/src/frontends/qt/GuiPrefs.h
@@ -15,7 +15,6 @@
 #define GUIPREFS_H
 
 #include "GuiDialog.h"
 #define GUIPREFS_H
 
 #include "GuiDialog.h"

-#include "GuiLyXFiles.h"

 
 #include "Converter.h"
 #include "Format.h"
 
 #include "Converter.h"
 #include "Format.h"


@@ -52,6 +51,7 @@ namespace lyx {
 
 namespace frontend {
 
 
 namespace frontend {
 

+class GuiLyXFiles;

 class PrefModule;
 
 class GuiPreferences : public GuiDialog, public Ui::PrefsUi
 class PrefModule;
 
 class GuiPreferences : public GuiDialog, public Ui::PrefsUi

diff --git a/src/frontends/qt/GuiRef.cpp b/src/frontends/qt/GuiRef.cpp
index 83946c24d3b49ba791b0d2dba37d49d290355025..b0aaba6a87b3912fd76cac712926a53c1c734b7c 100644 (file)
--- a/src/frontends/qt/GuiRef.cpp
+++ b/src/frontends/qt/GuiRef.cpp
@@ -20,6 +20,7 @@
 #include "BufferList.h"
 #include "BufferView.h"
 #include "Cursor.h"
 #include "BufferList.h"
 #include "BufferView.h"
 #include "Cursor.h"

+#include "FancyLineEdit.h"

 #include "FuncRequest.h"
 
 #include "qt_helpers.h"
 #include "FuncRequest.h"
 
 #include "qt_helpers.h"

diff --git a/src/frontends/qt/GuiRef.h b/src/frontends/qt/GuiRef.h
index 46e99ea96d99df78b5c0a0ce8e34e0c2cd3110bc..02ef307ac5dc8ffe2a3f43d435663e80285171c6 100644 (file)
--- a/src/frontends/qt/GuiRef.h
+++ b/src/frontends/qt/GuiRef.h
@@ -14,7 +14,6 @@
 
 #include "GuiDialog.h"
 #include "ui_RefUi.h"
 
 #include "GuiDialog.h"
 #include "ui_RefUi.h"

-#include "FancyLineEdit.h"

 
 #include "insets/InsetCommandParams.h"
 
 
 #include "insets/InsetCommandParams.h"
 


@@ -25,6 +24,8 @@ class QTreeWidgetItem;
 namespace lyx {
 namespace frontend {
 
 namespace lyx {
 namespace frontend {
 

+class FancyLineEdit;
+

 class GuiRef : public GuiDialog, public Ui::RefUi
 {
        Q_OBJECT
 class GuiRef : public GuiDialog, public Ui::RefUi
 {
        Q_OBJECT

diff --git a/src/frontends/qt/GuiView.cpp b/src/frontends/qt/GuiView.cpp
index d417ffecd93d081397bd6fece2390693a2741237..4dca7bf5311198796e2e69568cdcfa8027add089 100644 (file)
--- a/src/frontends/qt/GuiView.cpp
+++ b/src/frontends/qt/GuiView.cpp
@@ -50,6 +50,7 @@
 #include "Format.h"
 #include "FuncStatus.h"
 #include "FuncRequest.h"
 #include "Format.h"
 #include "FuncStatus.h"
 #include "FuncRequest.h"

+#include "KeySymbol.h"

 #include "Language.h"
 #include "LayoutFile.h"
 #include "Lexer.h"
 #include "Language.h"
 #include "LayoutFile.h"
 #include "Lexer.h"

diff --git a/src/frontends/qt/GuiViewSource.h b/src/frontends/qt/GuiViewSource.h
index 1ea13037568f66ef3e8a229dcf691792ce61596d..8b2a005ba2c994b0b3956b96af58f7b97d80d1d0 100644 (file)
--- a/src/frontends/qt/GuiViewSource.h
+++ b/src/frontends/qt/GuiViewSource.h
@@ -28,6 +28,7 @@ class QTextDocument;
 
 namespace lyx {
 
 
 namespace lyx {
 

+class BufferView;

 class TexRow;
 
 
 class TexRow;
 
 

diff --git a/src/frontends/qt/GuiWorkArea.h b/src/frontends/qt/GuiWorkArea.h
index 2f155bf7c183bbdbff7154aba159b707a3e81e00..8e1790a2bb503629ded824a6c7f676c839737f2d 100644 (file)
--- a/src/frontends/qt/GuiWorkArea.h
+++ b/src/frontends/qt/GuiWorkArea.h
@@ -16,7 +16,6 @@
 #include "ui_WorkAreaUi.h"
 
 #include "frontends/WorkArea.h"
 #include "ui_WorkAreaUi.h"
 
 #include "frontends/WorkArea.h"

-#include "frontends/KeySymbol.h"

 
 #include <QAbstractScrollArea>
 #include <QTabBar>
 
 #include <QAbstractScrollArea>
 #include <QTabBar>


@@ -30,6 +29,7 @@ namespace lyx {
 class Buffer;
 class BufferView;
 class FuncRequest;
 class Buffer;
 class BufferView;
 class FuncRequest;

+class KeySymbol;

 
 namespace frontend {
 
 
 namespace frontend {
 

diff --git a/src/frontends/qt/Menus.cpp b/src/frontends/qt/Menus.cpp
index b433773ad5e061af25eb14eb7a65a7a7bc3f5009..afe43c70f1f697d7d11cf02f625025456b80887c 100644 (file)
--- a/src/frontends/qt/Menus.cpp
+++ b/src/frontends/qt/Menus.cpp
@@ -29,6 +29,7 @@
 #include "Buffer.h"
 #include "BufferList.h"
 #include "BufferParams.h"
 #include "Buffer.h"
 #include "BufferList.h"
 #include "BufferParams.h"

+#include "BufferView.h"

 #include "Converter.h"
 #include "Cursor.h"
 #include "CutAndPaste.h"
 #include "Converter.h"
 #include "Cursor.h"
 #include "CutAndPaste.h"

diff --git a/src/frontends/qt/Menus.h b/src/frontends/qt/Menus.h
index 5df59ddf5dd372b58a21ca414b7687c0f2caec57..8166b4517892bde9becd5af32bf4b020d6cc318a 100644 (file)
--- a/src/frontends/qt/Menus.h
+++ b/src/frontends/qt/Menus.h
@@ -14,13 +14,13 @@
 #define MENUS_H
 
 #include <QMenu>
 #define MENUS_H
 
 #include <QMenu>

-#include "BufferView.h"

 
 class QString;
 class QMenuBar;
 
 namespace lyx {
 
 
 class QString;
 class QMenuBar;
 
 namespace lyx {
 

+class BufferView;

 class docstring_list;
 class Lexer;
 class FuncRequest;
 class docstring_list;
 class Lexer;
 class FuncRequest;

diff --git a/src/frontends/qt/PanelStack.cpp b/src/frontends/qt/PanelStack.cpp
index ef9c599a340cbf9f53fa7da3602cc44a0d47646a..2614284a8d2f287b8a00cb1c912ecc6ab786a2c5 100644 (file)
--- a/src/frontends/qt/PanelStack.cpp
+++ b/src/frontends/qt/PanelStack.cpp
@@ -15,6 +15,8 @@
 #include "GuiApplication.h"
 #include "qt_helpers.h"
 
 #include "GuiApplication.h"
 #include "qt_helpers.h"
 

+#include "FancyLineEdit.h"
+

 #include "support/debug.h"
 #include "support/lassert.h"
 
 #include "support/debug.h"
 #include "support/lassert.h"
 

diff --git a/src/frontends/qt/PanelStack.h b/src/frontends/qt/PanelStack.h
index 220afeec798494c02e0bc4e19df8a846044c5b32..7405954b96812e97dacd83a47b3e6aecafd8f2c2 100644 (file)
--- a/src/frontends/qt/PanelStack.h
+++ b/src/frontends/qt/PanelStack.h
@@ -13,8 +13,6 @@
 #ifndef PANELSTACK_H
 #define PANELSTACK_H
 
 #ifndef PANELSTACK_H
 #define PANELSTACK_H
 

-#include "FancyLineEdit.h"
-

 #include <QHash>
 #include <QWidget>
 
 #include <QHash>
 #include <QWidget>
 


@@ -27,6 +25,7 @@ class QTreeWidgetItem;
 namespace lyx {
 namespace frontend {
 
 namespace lyx {
 namespace frontend {
 

+class FancyLineEdit;

 
 class PanelStack : public QWidget
 {
 
 class PanelStack : public QWidget
 {

diff --git a/src/frontends/qt/TocWidget.h b/src/frontends/qt/TocWidget.h
index c8fa08a6f166a96dbcb4a6497a33791b6fa7364a..3545a44e1c9f93713dac09a5c5f330ff8a2d476d 100644 (file)
--- a/src/frontends/qt/TocWidget.h
+++ b/src/frontends/qt/TocWidget.h
@@ -15,7 +15,7 @@
 
 #include "ui_TocUi.h"
 
 
 #include "ui_TocUi.h"
 

-#include "FuncRequest.h"
+#include "FuncCode.h"

 
 #include <QString>
 #include <QWidget>
 
 #include <QString>
 #include <QWidget>


@@ -28,6 +28,7 @@ namespace lyx {
 
 class Cursor;
 class DispatchResult;
 
 class Cursor;
 class DispatchResult;

+class FuncRequest;

 class FuncStatus;
 class Inset;
 
 class FuncStatus;
 class Inset;
 

diff --git a/src/frontends/qt/Toolbars.h b/src/frontends/qt/Toolbars.h
index 0083658a64cbf1269d59d23129e1006805bc0585..2d9213986cfb8e1224af2068d88584d7eb974424 100644 (file)
--- a/src/frontends/qt/Toolbars.h
+++ b/src/frontends/qt/Toolbars.h
@@ -13,7 +13,7 @@
 #ifndef TOOLBAR_BACKEND_H
 #define TOOLBAR_BACKEND_H
 
 #ifndef TOOLBAR_BACKEND_H
 #define TOOLBAR_BACKEND_H
 

-#include "FuncRequest.h"
+#include "support/docstring.h"

 
 #include <vector>
 #include <map>
 
 #include <vector>
 #include <map>


@@ -22,6 +22,7 @@
 
 namespace lyx {
 
 
 namespace lyx {
 

+class FuncRequest;

 class Lexer;
 
 namespace frontend {
 class Lexer;
 
 namespace frontend {

diff --git a/src/insets/Inset.h b/src/insets/Inset.h
index d2be340195f4eb6ce52c9a203e0ac94bc8aefa2b..2fec7023a6fa1bea461181f547615e61d87f74fc 100644 (file)
--- a/src/insets/Inset.h
+++ b/src/insets/Inset.h
@@ -24,7 +24,6 @@
 
 #include "support/strfwd.h"
 #include "support/types.h"
 
 #include "support/strfwd.h"
 #include "support/types.h"

-#include "support/FileNameList.h"

 
 #include <climits>
 
 
 #include <climits>
 


@@ -66,6 +65,7 @@ class otexstream;
 
 namespace graphics { class PreviewLoader; }
 
 
 namespace graphics { class PreviewLoader; }
 

+namespace support {class FileNameList; }

 
 /// returns the InsetCode corresponding to the \c name.
 /// Eg, insetCode("branch") == BRANCH_CODE
 
 /// returns the InsetCode corresponding to the \c name.
 /// Eg, insetCode("branch") == BRANCH_CODE

diff --git a/src/insets/InsetCitation.cpp b/src/insets/InsetCitation.cpp
index 6f52fe273547e69f6e6c6d6d301089caaa55312c..ead9d3a8a08db8ac19871f543955715d1372d61b 100644 (file)
--- a/src/insets/InsetCitation.cpp
+++ b/src/insets/InsetCitation.cpp
@@ -18,6 +18,7 @@
 #include "buffer_funcs.h"
 #include "BufferParams.h"
 #include "BufferView.h"
 #include "buffer_funcs.h"
 #include "BufferParams.h"
 #include "BufferView.h"

+#include "Citation.h"

 #include "DispatchResult.h"
 #include "FuncCode.h"
 #include "FuncRequest.h"
 #include "DispatchResult.h"
 #include "FuncCode.h"
 #include "FuncRequest.h"

diff --git a/src/insets/InsetCitation.h b/src/insets/InsetCitation.h
index b085a2c9428c30f5eb411225bc943b96dfec051a..3be20013cbc03d8bb183108573472c7b4edff12f 100644 (file)
--- a/src/insets/InsetCitation.h
+++ b/src/insets/InsetCitation.h
@@ -14,10 +14,11 @@
 #define INSET_CITATION_H
 
 #include "InsetCommand.h"
 #define INSET_CITATION_H
 
 #include "InsetCommand.h"

-#include "Citation.h"

 
 namespace lyx {
 
 
 namespace lyx {
 

+class CitationStyle;
+

 /////////////////////////////////////////////////////////////////////////
 //
 // InsetCitation
 /////////////////////////////////////////////////////////////////////////
 //
 // InsetCitation

diff --git a/src/insets/InsetCollapsible.cpp b/src/insets/InsetCollapsible.cpp
index 20e595ff32e22ed0371a58e913afc4969e75e9eb..c118545002cc11875d85df1f0c22812486d54151 100644 (file)
--- a/src/insets/InsetCollapsible.cpp
+++ b/src/insets/InsetCollapsible.cpp
@@ -35,6 +35,7 @@
 
 #include "support/debug.h"
 #include "support/docstream.h"
 
 #include "support/debug.h"
 #include "support/docstream.h"

+#include "support/FileName.h"

 #include "support/gettext.h"
 #include "support/lassert.h"
 #include "support/lstrings.h"
 #include "support/gettext.h"
 #include "support/lassert.h"
 #include "support/lstrings.h"