diff --git a/src/insets/Inset.cpp b/src/insets/Inset.cpp
index dbefc1279d..86a6040ddd 100644
--- a/src/insets/Inset.cpp
+++ b/src/insets/Inset.cpp
@@ -160,6 +160,22 @@ docstring Inset::name() const
 }
 
 
+bool Inset::isFreeSpacing() const 
+{
+	return getLayout().isFreeSpacing();
+}
+
+
+bool Inset::allowEmpty() const
+{
+	return getLayout().isKeepEmpty();
+}
+
+bool Inset::forceLTR() const
+{
+	return getLayout().isForceLtr();
+}
+
 void Inset::initView()
 {
 	if (isLabeled())
diff --git a/src/insets/Inset.h b/src/insets/Inset.h
index b130f6d8d5..f932c0aee3 100644
--- a/src/insets/Inset.h
+++ b/src/insets/Inset.h
@@ -206,11 +206,11 @@ public:
 		CursorSlice const & sl, bool boundary, int & x, int & y) const;
 
 	/// Allow multiple blanks
-	virtual bool isFreeSpacing() const { return getLayout().isFreeSpacing(); }
+	virtual bool isFreeSpacing() const;
 	/// Don't eliminate empty paragraphs
-	virtual bool allowEmpty() const { return getLayout().isKeepEmpty(); }
+	virtual bool allowEmpty() const;
 	/// Force inset into LTR environment if surroundings are RTL?
-	virtual bool forceLTR() const { return getLayout().isForceLtr(); }
+	virtual bool forceLTR() const;
 
 	/// Where should we go when we press the up or down cursor key?
 	virtual bool idxUpDown(Cursor & cur, bool up) const;
diff --git a/src/insets/InsetCollapsable.h b/src/insets/InsetCollapsable.h
index e69fa7b957..41c79334fc 100644
--- a/src/insets/InsetCollapsable.h
+++ b/src/insets/InsetCollapsable.h
@@ -126,8 +126,6 @@ public:
 	/// Returns the geometry disregarding auto_open_
 	Geometry geometry() const;
 	///
-	bool allowMultiPar() const;
-	///
 	bool getStatus(Cursor &, FuncRequest const &, FuncStatus &) const;
 	///
 	void setStatus(Cursor & cur, CollapseStatus st);
diff --git a/src/insets/InsetText.h b/src/insets/InsetText.h
index d133d8fb0f..d2526a6afa 100644
--- a/src/insets/InsetText.h
+++ b/src/insets/InsetText.h
@@ -17,6 +17,8 @@
 #include "ColorCode.h"
 #include "Text.h"
 
+#include "insets/InsetLayout.h"
+
 namespace lyx {
 
 class CompletionList;