From 1dffc5cfe45c34d9ef42d3d58d2ed4ce855339e2 Mon Sep 17 00:00:00 2001 From: Angus Leeming Date: Thu, 4 Sep 2003 03:54:04 +0000 Subject: [PATCH] Move #includes out of header files. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@7659 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/BufferView.C | 1 + src/ChangeLog | 12 ++++++ src/FloatList.C | 1 + src/FloatList.h | 3 +- src/LaTeX.C | 1 + src/LaTeX.h | 3 +- src/LaTeXFeatures.C | 1 + src/LyXAction.C | 1 + src/LyXAction.h | 8 +++- src/MenuBackend.C | 1 + src/ToolbarBackend.C | 1 + src/buffer.h | 7 ++-- src/bufferparams.C | 29 ++++++++------- src/bufferparams.h | 2 - src/frontends/Alert_pimpl.h | 2 - src/frontends/ChangeLog | 7 ++++ src/frontends/LyXView.h | 2 - src/frontends/WorkArea.h | 2 +- src/frontends/controllers/ControlDocument.C | 1 + src/frontends/controllers/ControlErrorList.C | 7 ++-- src/frontends/qt2/QLToolbar.C | 1 + src/frontends/qt2/QWorkArea.C | 1 + src/frontends/screen.h | 2 - src/frontends/xforms/Alert_pimpl.C | 3 +- src/frontends/xforms/ChangeLog | 4 ++ src/insets/ChangeLog | 2 + src/insets/insetcaption.C | 1 + src/insets/insetenv.C | 8 ++-- src/insets/insetfloatlist.C | 14 ++++--- src/insets/insetgraphics.C | 3 +- src/insets/insetnote.C | 1 + src/insets/insettabular.C | 1 + src/insets/insetwrap.C | 1 + src/lyx_cb.C | 1 + src/lyx_main.C | 39 ++++++++++---------- src/lyx_main.h | 2 +- src/lyxfunc.C | 2 + src/lyxfunc.h | 2 +- src/lyxrc.h | 2 +- src/lyxtext.h | 2 +- src/lyxtextclass.C | 1 + src/paragraph_funcs.C | 1 + src/paragraph_pimpl.h | 1 - src/support/ChangeLog | 5 +++ src/support/LAssert.C | 1 + src/support/filename.C | 6 ++- src/support/filetools.h | 1 - src/text.C | 1 + src/text2.C | 1 + src/toc.C | 1 + 50 files changed, 130 insertions(+), 73 deletions(-) diff --git a/src/BufferView.C b/src/BufferView.C index b8ee1de146..81a59e3e05 100644 --- a/src/BufferView.C +++ b/src/BufferView.C @@ -25,6 +25,7 @@ #include "debug.h" #include "gettext.h" #include "errorlist.h" +#include "funcrequest.h" #include "iterators.h" #include "language.h" #include "lyxcursor.h" diff --git a/src/ChangeLog b/src/ChangeLog index 2c12ed6faf..61ba4a3f68 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,15 @@ +2003-09-04 Angus Leeming + + * FloatList.h: move out #include "Floating.h". + * LaTeX.h: move out #include "DepTable.h". + * LyXAction.h: move out #include "funcrequest.h". + * buffer.h: move out #include "author.h", "iterators.h". + * bufferparams.h: move out #include "LaTeXFeatures.h", "texrow.h". + * lyx_main.h: move out #include "errorlist.h". + * lyxfunc.h: move out #include "FuncStatus.h". + * lyxtext: move out #include "lyxcursor.h". + * paragraph_pimpl.h: move out #include "counters.h". + 2003-09-03 Angus Leeming * LaTeXFeatures.[Ch]: replace the externalPreambles string with a diff --git a/src/FloatList.C b/src/FloatList.C index 3fdef671f4..b6d4ba87a5 100644 --- a/src/FloatList.C +++ b/src/FloatList.C @@ -11,6 +11,7 @@ #include #include "FloatList.h" +#include "Floating.h" #include "gettext.h" // This class is now mostly finished, except one thing, it is a global diff --git a/src/FloatList.h b/src/FloatList.h index 40611c6464..ac9d832c61 100644 --- a/src/FloatList.h +++ b/src/FloatList.h @@ -15,7 +15,8 @@ #include #include "LString.h" -#include "Floating.h" + +class Floating; /// class FloatList { diff --git a/src/LaTeX.C b/src/LaTeX.C index 09375062f8..3f6b97d119 100644 --- a/src/LaTeX.C +++ b/src/LaTeX.C @@ -18,6 +18,7 @@ #include "bufferlist.h" #include "gettext.h" #include "debug.h" +#include "DepTable.h" #include "support/filetools.h" #include "support/FileInfo.h" #include "support/tostr.h" diff --git a/src/LaTeX.h b/src/LaTeX.h index 52c6e4d749..751d01e98c 100644 --- a/src/LaTeX.h +++ b/src/LaTeX.h @@ -16,13 +16,14 @@ #include "latexrunparams.h" #include "LString.h" -#include "DepTable.h" #include #include #include #include +class DepTable; + /// class TeXErrors { private: diff --git a/src/LaTeXFeatures.C b/src/LaTeXFeatures.C index e6658dc43f..6984882c5e 100644 --- a/src/LaTeXFeatures.C +++ b/src/LaTeXFeatures.C @@ -19,6 +19,7 @@ #include "lyx_sty.h" #include "lyxrc.h" #include "bufferparams.h" +#include "Floating.h" #include "FloatList.h" #include "language.h" #include "encoding.h" diff --git a/src/LyXAction.C b/src/LyXAction.C index 14d18422b4..4a5bf1a023 100644 --- a/src/LyXAction.C +++ b/src/LyXAction.C @@ -16,6 +16,7 @@ #include "LyXAction.h" #include "debug.h" +#include "funcrequest.h" #include "gettext.h" #include "support/lstrings.h" diff --git a/src/LyXAction.h b/src/LyXAction.h index 99972dc2e9..5d7c88ede6 100644 --- a/src/LyXAction.h +++ b/src/LyXAction.h @@ -13,10 +13,14 @@ #ifndef LYXACTION_H #define LYXACTION_H +#include "lfuns.h" + +#include "LString.h" +#include #include -#include "funcrequest.h" -#include + +class FuncRequest; /** * This class is a container for LyX actions. It also diff --git a/src/MenuBackend.C b/src/MenuBackend.C index ef780bbc7a..1a25d7188f 100644 --- a/src/MenuBackend.C +++ b/src/MenuBackend.C @@ -29,6 +29,7 @@ #include "format.h" #include "exporter.h" #include "importer.h" +#include "Floating.h" #include "FloatList.h" #include "toc.h" #include "CutAndPaste.h" diff --git a/src/ToolbarBackend.C b/src/ToolbarBackend.C index 099d9cafaf..c605f27b8d 100644 --- a/src/ToolbarBackend.C +++ b/src/ToolbarBackend.C @@ -12,6 +12,7 @@ #include #include "ToolbarBackend.h" +#include "funcrequest.h" #include "LyXAction.h" #include "lyxlex.h" #include "debug.h" diff --git a/src/buffer.h b/src/buffer.h index cde82c260d..dd668983e4 100644 --- a/src/buffer.h +++ b/src/buffer.h @@ -20,22 +20,21 @@ #include "bufferparams.h" #include "texrow.h" #include "ParagraphList.h" -#include "author.h" -#include "iterators.h" #include "errorlist.h" #include #include #include +class AuthorList; class LyXRC; -class TeXErrors; class LaTeXFeatures; class LatexRunParams; class Language; +class Messages; class ParIterator; class ParConstIterator; -class Messages; +class TeXErrors; /** The buffer object. diff --git a/src/bufferparams.C b/src/bufferparams.C index 4f77aa5617..ac250f11a2 100644 --- a/src/bufferparams.C +++ b/src/bufferparams.C @@ -15,29 +15,30 @@ #include -#include "bufferparams.h" -#include "tex-strings.h" -#include "encoding.h" -#include "layout.h" -#include "vspace.h" -#include "debug.h" -#include "lyxrc.h" -#include "language.h" -#include "lyxtextclasslist.h" -#include "lyxlex.h" -#include "Lsstream.h" #include "author.h" +#include "bufferparams.h" +#include "debug.h" +#include "encoding.h" #include "gettext.h" - +#include "layout.h" +#include "language.h" +#include "LaTeXFeatures.h" #include "LColor.h" +#include "Lsstream.h" +#include "lyxrc.h" +#include "lyxlex.h" +#include "lyxtextclasslist.h" +#include "tex-strings.h" +#include "texrow.h" +#include "vspace.h" + +#include "frontends/Alert.h" #include "support/lyxalgo.h" // for lyx::count #include "support/lyxlib.h" #include "support/lstrings.h" #include "support/types.h" -#include "frontends/Alert.h" - #include #include diff --git a/src/bufferparams.h b/src/bufferparams.h index dff2f3b4fb..aafc6c56e6 100644 --- a/src/bufferparams.h +++ b/src/bufferparams.h @@ -20,8 +20,6 @@ #include "Spacing.h" #include "Bullet.h" #include "lyxtextclass.h" -#include "LaTeXFeatures.h" -#include "texrow.h" #include "author.h" #include "paper.h" #include "BranchList.h" diff --git a/src/frontends/Alert_pimpl.h b/src/frontends/Alert_pimpl.h index 4fb89f1976..d128d7de1a 100644 --- a/src/frontends/Alert_pimpl.h +++ b/src/frontends/Alert_pimpl.h @@ -9,8 +9,6 @@ * Full author contact details are available in file CREDITS. */ -#include "debug.h" - // GUI-specific implementations int prompt_pimpl(string const & title, string const & question, diff --git a/src/frontends/ChangeLog b/src/frontends/ChangeLog index 92267ad80b..5cb3700652 100644 --- a/src/frontends/ChangeLog +++ b/src/frontends/ChangeLog @@ -1,3 +1,10 @@ +2003-09-04 Angus Leeming + + * Alert_pimpl.h: move out #include "debug.h". + * LyXView.h: move out #include "types.h". + * WorkArea.h: move out #include "funcrequest.h". + * screen.h: move out #include "RowList.h". + 2003-09-02 John Levon * screen.C: remove cursor.i[xy]() diff --git a/src/frontends/LyXView.h b/src/frontends/LyXView.h index fc859cbecb..1db93a3772 100644 --- a/src/frontends/LyXView.h +++ b/src/frontends/LyXView.h @@ -16,8 +16,6 @@ #include "LString.h" -#include "support/types.h" - #include #include #include diff --git a/src/frontends/WorkArea.h b/src/frontends/WorkArea.h index 55a54026c4..bbd2820aa0 100644 --- a/src/frontends/WorkArea.h +++ b/src/frontends/WorkArea.h @@ -15,7 +15,6 @@ #include "frontends/key_state.h" #include "frontends/LyXKeySym.h" -#include "funcrequest.h" #include #include @@ -25,6 +24,7 @@ #include class Painter; +class FuncRequest; /** * The work area class represents the widget that provides the diff --git a/src/frontends/controllers/ControlDocument.C b/src/frontends/controllers/ControlDocument.C index e2dff12776..bb39333e48 100644 --- a/src/frontends/controllers/ControlDocument.C +++ b/src/frontends/controllers/ControlDocument.C @@ -20,6 +20,7 @@ #include "buffer.h" #include "buffer_funcs.h" #include "errorlist.h" +#include "iterators.h" #include "language.h" #include "lyx_main.h" #include "lyxtextclass.h" diff --git a/src/frontends/controllers/ControlErrorList.C b/src/frontends/controllers/ControlErrorList.C index a4eee56d3b..248006169e 100644 --- a/src/frontends/controllers/ControlErrorList.C +++ b/src/frontends/controllers/ControlErrorList.C @@ -11,12 +11,13 @@ #include #include "ControlErrorList.h" -#include "support/lstrings.h" // tostr -#include "errorlist.h" #include "buffer.h" #include "BufferView.h" -#include "lyxtext.h" #include "debug.h" +#include "errorlist.h" +#include "iterators.h" +#include "lyxtext.h" +#include "support/lstrings.h" // tostr using std::endl; diff --git a/src/frontends/qt2/QLToolbar.C b/src/frontends/qt2/QLToolbar.C index 9dc759fa21..4b00eda082 100644 --- a/src/frontends/qt2/QLToolbar.C +++ b/src/frontends/qt2/QLToolbar.C @@ -16,6 +16,7 @@ #include "debug.h" #include "gettext.h" #include "lyxfunc.h" +#include "funcrequest.h" #include "FuncStatus.h" #include "BufferView.h" #include "buffer.h" diff --git a/src/frontends/qt2/QWorkArea.C b/src/frontends/qt2/QWorkArea.C index 256369ee76..fd2c5054b9 100644 --- a/src/frontends/qt2/QWorkArea.C +++ b/src/frontends/qt2/QWorkArea.C @@ -16,6 +16,7 @@ #include "lfuns.h" #include "qt_helpers.h" #include "lcolorcache.h" +#include "funcrequest.h" #include #include diff --git a/src/frontends/screen.h b/src/frontends/screen.h index 3ef3e5b0d9..89cadb2428 100644 --- a/src/frontends/screen.h +++ b/src/frontends/screen.h @@ -13,8 +13,6 @@ #ifndef SCREEN_H #define SCREEN_H -#include "RowList.h" - class LyXText; class LyXCursor; class WorkArea; diff --git a/src/frontends/xforms/Alert_pimpl.C b/src/frontends/xforms/Alert_pimpl.C index 2e87fcd193..52ea544475 100644 --- a/src/frontends/xforms/Alert_pimpl.C +++ b/src/frontends/xforms/Alert_pimpl.C @@ -10,13 +10,14 @@ #include - #include "Alert.h" #include "Alert_pimpl.h" #include "forms_gettext.h" #include "gettext.h" #include "xforms_helpers.h" +#include "debug.h" + #include #include #include "lyx_forms.h" diff --git a/src/frontends/xforms/ChangeLog b/src/frontends/xforms/ChangeLog index 522f1c2418..9b3374b957 100644 --- a/src/frontends/xforms/ChangeLog +++ b/src/frontends/xforms/ChangeLog @@ -1,3 +1,7 @@ +2003-09-04 Angus Leeming + + * Alert_pimpl.C: move #include "debug.h" out of the header file. + 2003-08-17 Martin Vermeer * FormDocument.C: fix crash on doc settings for non-branched doc diff --git a/src/insets/ChangeLog b/src/insets/ChangeLog index a44fa7c266..2bd75886a1 100644 --- a/src/insets/ChangeLog +++ b/src/insets/ChangeLog @@ -1,5 +1,7 @@ 2003-09-04 Angus Leeming + * insetgraphics.C: #include "support/os.h" + * insetfoot.h: move #include "LaTeXFeatures.h" out of the header file. * insettabular.h: move #include "FuncStatus.h" out of the header file. * insettoc.[Ch]: move #include "metricsinfo.h" out of the header file. diff --git a/src/insets/insetcaption.C b/src/insets/insetcaption.C index 3bc71ac4d7..3bd8cd5026 100644 --- a/src/insets/insetcaption.C +++ b/src/insets/insetcaption.C @@ -15,6 +15,7 @@ #include "frontends/font_metrics.h" #include "BufferView.h" #include "buffer.h" +#include "Floating.h" #include "FloatList.h" #include "insets/insetfloat.h" #include "insets/insetwrap.h" diff --git a/src/insets/insetenv.C b/src/insets/insetenv.C index 86bfc50a77..3886f765e4 100644 --- a/src/insets/insetenv.C +++ b/src/insets/insetenv.C @@ -11,14 +11,14 @@ #include #include "insetenv.h" +#include "bufferparams.h" +#include "debug.h" #include "gettext.h" +#include "lyxlayout.h" #include "lyxtextclass.h" #include "paragraph_funcs.h" -#include "lyxlayout.h" -#include "bufferparams.h" +#include "texrow.h" #include "support/LOstream.h" -#include "debug.h" - using std::ostream; using std::endl; diff --git a/src/insets/insetfloatlist.C b/src/insets/insetfloatlist.C index 72289b435c..c4abb64f39 100644 --- a/src/insets/insetfloatlist.C +++ b/src/insets/insetfloatlist.C @@ -11,16 +11,18 @@ #include #include "insetfloatlist.h" + +#include "buffer.h" +#include "BufferView.h" +#include "debug.h" +#include "Floating.h" #include "FloatList.h" -#include "metricsinfo.h" +#include "funcrequest.h" +#include "gettext.h" #include "LaTeXFeatures.h" #include "lyxlex.h" -#include "BufferView.h" -#include "funcrequest.h" -#include "buffer.h" +#include "metricsinfo.h" #include "toc.h" -#include "gettext.h" -#include "debug.h" #include "Lsstream.h" #include "support/lstrings.h" diff --git a/src/insets/insetgraphics.C b/src/insets/insetgraphics.C index ec7b4e0e95..e7b69c6ae8 100644 --- a/src/insets/insetgraphics.C +++ b/src/insets/insetgraphics.C @@ -78,8 +78,9 @@ TODO #include "support/filetools.h" #include "support/lyxalgo.h" // lyx::count #include "support/lyxlib.h" // float_equal -#include "support/tostr.h" +#include "support/os.h" #include "support/systemcall.h" +#include "support/tostr.h" #include #include diff --git a/src/insets/insetnote.C b/src/insets/insetnote.C index be55fc366c..d05b87680e 100644 --- a/src/insets/insetnote.C +++ b/src/insets/insetnote.C @@ -21,6 +21,7 @@ #include "funcrequest.h" #include "gettext.h" #include "language.h" +#include "LaTeXFeatures.h" #include "lyxfont.h" #include "lyxlex.h" #include "lyxtext.h" diff --git a/src/insets/insettabular.C b/src/insets/insettabular.C index fc9b4834a2..c930f08e6e 100644 --- a/src/insets/insettabular.C +++ b/src/insets/insettabular.C @@ -19,6 +19,7 @@ #include "debug.h" #include "dimension.h" #include "funcrequest.h" +#include "FuncStatus.h" #include "gettext.h" #include "language.h" #include "LaTeXFeatures.h" diff --git a/src/insets/insetwrap.C b/src/insets/insetwrap.C index 8eb58801b3..f87350f4ca 100644 --- a/src/insets/insetwrap.C +++ b/src/insets/insetwrap.C @@ -17,6 +17,7 @@ #include "BufferView.h" #include "debug.h" #include "funcrequest.h" +#include "Floating.h" #include "FloatList.h" #include "gettext.h" #include "LaTeXFeatures.h" diff --git a/src/lyx_cb.C b/src/lyx_cb.C index 79a930170b..a58ed4ff6e 100644 --- a/src/lyx_cb.C +++ b/src/lyx_cb.C @@ -42,6 +42,7 @@ #include "support/lyxlib.h" #include "support/path.h" #include "support/path_defines.h" +#include "support/os.h" #include "support/systemcall.h" #include diff --git a/src/lyx_main.C b/src/lyx_main.C index dc59f8c211..250b74681c 100644 --- a/src/lyx_main.C +++ b/src/lyx_main.C @@ -17,35 +17,36 @@ #include "lyx_main.h" -#include "support/filetools.h" -#include "support/lyxlib.h" -#include "support/FileInfo.h" -#include "support/path.h" -#include "support/path_defines.h" -#include "debug.h" -#include "gettext.h" -#include "lyxlex.h" - -#include "graphics/GraphicsTypes.h" - -#include "bufferlist.h" #include "buffer.h" #include "buffer_funcs.h" -#include "lyxserver.h" +#include "bufferlist.h" +#include "converter.h" +#include "debug.h" +#include "encoding.h" +#include "format.h" +#include "gettext.h" #include "kbmap.h" -#include "lyxfunc.h" -#include "ToolbarBackend.h" -#include "MenuBackend.h" #include "language.h" #include "lastfiles.h" -#include "encoding.h" -#include "converter.h" -#include "format.h" +#include "lyxfunc.h" +#include "lyxlex.h" #include "lyxtextclasslist.h" +#include "lyxserver.h" +#include "MenuBackend.h" +#include "ToolbarBackend.h" #include "frontends/Alert.h" #include "frontends/lyx_gui.h" +#include "graphics/GraphicsTypes.h" + +#include "support/FileInfo.h" +#include "support/filetools.h" +#include "support/lyxlib.h" +#include "support/os.h" +#include "support/path.h" +#include "support/path_defines.h" + #include #include #include diff --git a/src/lyx_main.h b/src/lyx_main.h index 0c1fc0b462..af5386d7ce 100644 --- a/src/lyx_main.h +++ b/src/lyx_main.h @@ -15,7 +15,6 @@ #define LYX_MAIN_H #include "LString.h" -#include "errorlist.h" #include #include @@ -23,6 +22,7 @@ #include +class ErrorItem; class LyXRC; class LastFiles; class Buffer; diff --git a/src/lyxfunc.C b/src/lyxfunc.C index 98e62648ee..c7de612436 100644 --- a/src/lyxfunc.C +++ b/src/lyxfunc.C @@ -26,6 +26,8 @@ #include "buffer.h" #include "buffer_funcs.h" #include "BufferView.h" +#include "funcrequest.h" +#include "iterators.h" #include "lyxserver.h" #include "intl.h" #include "lyx_main.h" diff --git a/src/lyxfunc.h b/src/lyxfunc.h index a64146516c..696f98f9db 100644 --- a/src/lyxfunc.h +++ b/src/lyxfunc.h @@ -15,13 +15,13 @@ #ifndef LYXFUNC_H #define LYXFUNC_H -#include "FuncStatus.h" #include "kbsequence.h" #include "lfuns.h" #include "LString.h" #include +class FuncStatus; class LyXView; class LyXText; class FuncRequest; diff --git a/src/lyxrc.h b/src/lyxrc.h index 26fcafeb21..dfd00286da 100644 --- a/src/lyxrc.h +++ b/src/lyxrc.h @@ -18,7 +18,7 @@ #ifndef LYXRC_H #define LYXRC_H -#include "paper.h" +#include "paper.h" #include "graphics/GraphicsTypes.h" // #include diff --git a/src/lyxtext.h b/src/lyxtext.h index 6fbbc6f7db..59108b3936 100644 --- a/src/lyxtext.h +++ b/src/lyxtext.h @@ -15,7 +15,6 @@ #define LYXTEXT_H #include "lyxfont.h" -#include "lyxcursor.h" #include "layout.h" #include "LColor.h" #include "insets/inset.h" @@ -27,6 +26,7 @@ class Buffer; class BufferParams; class BufferView; class InsetText; +class LyXCursor; class Paragraph; class Row; class Spacing; diff --git a/src/lyxtextclass.C b/src/lyxtextclass.C index fe35702d0c..b2a604bbbc 100644 --- a/src/lyxtextclass.C +++ b/src/lyxtextclass.C @@ -18,6 +18,7 @@ #include "debug.h" #include "lyxlex.h" #include "counters.h" +#include "Floating.h" #include "FloatList.h" #include "support/lstrings.h" diff --git a/src/paragraph_funcs.C b/src/paragraph_funcs.C index c13bf6e706..f2218b8c57 100644 --- a/src/paragraph_funcs.C +++ b/src/paragraph_funcs.C @@ -17,6 +17,7 @@ #include "lyxtextclasslist.h" #include "debug.h" #include "gettext.h" +#include "iterators.h" #include "language.h" #include "encoding.h" #include "lyxrc.h" diff --git a/src/paragraph_pimpl.h b/src/paragraph_pimpl.h index e636af459d..7e5ba6d016 100644 --- a/src/paragraph_pimpl.h +++ b/src/paragraph_pimpl.h @@ -18,7 +18,6 @@ #include "paragraph.h" #include "ParagraphParameters.h" #include "changes.h" -#include "counters.h" #include diff --git a/src/support/ChangeLog b/src/support/ChangeLog index 0e21781ea9..a8a4424459 100644 --- a/src/support/ChangeLog +++ b/src/support/ChangeLog @@ -1,3 +1,8 @@ +2003-09-04 Angus Leeming + + * filetools.h: + * filename.C: move #include "os.h" out of the header file. + 2003-09-04 Angus Leeming * path.C (ctor, dtor): move out of line. diff --git a/src/support/LAssert.C b/src/support/LAssert.C index 5d9d20a8ec..fb18db0e29 100644 --- a/src/support/LAssert.C +++ b/src/support/LAssert.C @@ -15,6 +15,7 @@ #ifdef ENABLE_ASSERTIONS #include "lyx_main.h" +#include "errorlist.h" namespace lyx { namespace support { diff --git a/src/support/filename.C b/src/support/filename.C index 121925250e..c8f34370c5 100644 --- a/src/support/filename.C +++ b/src/support/filename.C @@ -12,9 +12,11 @@ #include #include "filename.h" -#include "support/filetools.h" -#include "lstrings.h" + #include "LAssert.h" +#include "filetools.h" +#include "lstrings.h" +#include "os.h" namespace lyx { diff --git a/src/support/filetools.h b/src/support/filetools.h index d576a4f744..ff2a3de2e0 100644 --- a/src/support/filetools.h +++ b/src/support/filetools.h @@ -15,7 +15,6 @@ #include #include #include "LString.h" -#include "os.h" namespace lyx { diff --git a/src/text.C b/src/text.C index b558bd680b..4cc0cee594 100644 --- a/src/text.C +++ b/src/text.C @@ -25,6 +25,7 @@ #include "intl.h" #include "lyxrc.h" #include "encoding.h" +#include "funcrequest.h" #include "frontends/LyXView.h" #include "frontends/Painter.h" #include "frontends/font_metrics.h" diff --git a/src/text2.C b/src/text2.C index 848aa5b5dd..8158ebaa6c 100644 --- a/src/text2.C +++ b/src/text2.C @@ -37,6 +37,7 @@ #include "frontends/font_metrics.h" #include "debug.h" #include "lyxrc.h" +#include "Floating.h" #include "FloatList.h" #include "language.h" #include "ParagraphParameters.h" diff --git a/src/toc.C b/src/toc.C index f321ddb67f..5131554009 100644 --- a/src/toc.C +++ b/src/toc.C @@ -13,6 +13,7 @@ #include "toc.h" #include "buffer.h" +#include "funcrequest.h" #include "LyXAction.h" #include "paragraph.h" #include "debug.h"