From f90f3d146b860ceafb36209cad79e3ad6938f80b Mon Sep 17 00:00:00 2001
From: Vincent van Ravesteijn <vfr@lyx.org>
Date: Sun, 31 Oct 2010 01:26:50 +0000
Subject: [PATCH] More include frenzy.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35941 a592a061-630c-0410-9148-cb99ea01b6c8
---
 src/insets/Inset.h               | 2 +-
 src/insets/InsetListingsParams.h | 4 ++--
 src/insets/InsetPreview.cpp      | 1 +
 src/insets/InsetPreview.h        | 9 ++++++---
 src/insets/InsetTabular.h        | 1 -
 5 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/insets/Inset.h b/src/insets/Inset.h
index 09211a0232..36877d13c5 100644
--- a/src/insets/Inset.h
+++ b/src/insets/Inset.h
@@ -17,7 +17,7 @@
 
 #include "ColorCode.h"
 #include "InsetCode.h"
-#include "Layout.h"
+#include "LayoutEnums.h"
 #include "OutputEnums.h"
 
 #include "support/strfwd.h"
diff --git a/src/insets/InsetListingsParams.h b/src/insets/InsetListingsParams.h
index 76ed9613ff..6c2d3f20d6 100644
--- a/src/insets/InsetListingsParams.h
+++ b/src/insets/InsetListingsParams.h
@@ -12,10 +12,10 @@
 #ifndef INSETLISTINGSPARAMS_H
 #define INSETLISTINGSPARAMS_H
 
-#include <map>
-#include <exception>
 #include "InsetCollapsable.h"
 
+#include <map>
+
 namespace lyx {
 
 class InsetListingsParams {
diff --git a/src/insets/InsetPreview.cpp b/src/insets/InsetPreview.cpp
index a52ad19c95..265329bc52 100644
--- a/src/insets/InsetPreview.cpp
+++ b/src/insets/InsetPreview.cpp
@@ -19,6 +19,7 @@
 #include "LyXRC.h"
 #include "MetricsInfo.h"
 #include "OutputParams.h"
+#include "RenderPreview.h"
 
 #include "frontends/Painter.h"
 
diff --git a/src/insets/InsetPreview.h b/src/insets/InsetPreview.h
index 8a0332b1ec..b221d50b60 100644
--- a/src/insets/InsetPreview.h
+++ b/src/insets/InsetPreview.h
@@ -15,14 +15,17 @@
 #include "InsetText.h"
 
 #include "Dimension.h"
-#include "RenderPreview.h"
-
-#include "graphics/PreviewLoader.h"
 
 #include <boost/scoped_ptr.hpp>
 
 namespace lyx {
 
+class RenderPreview;
+
+namespace graphics {
+	class PreviewLoader;
+}
+
 /// An inset with an instant preview
 class InsetPreview : public InsetText {
 	
diff --git a/src/insets/InsetTabular.h b/src/insets/InsetTabular.h
index 03b66ae7af..1c97c173aa 100644
--- a/src/insets/InsetTabular.h
+++ b/src/insets/InsetTabular.h
@@ -25,7 +25,6 @@
 
 #include "Inset.h"
 #include "InsetText.h"
-#include "Layout.h"
 #include "Length.h"
 
 #include "support/shared_ptr.h"