diff --git a/src/Buffer.cpp b/src/Buffer.cpp
index e192c14665..d48a33955d 100644
--- a/src/Buffer.cpp
+++ b/src/Buffer.cpp
@@ -1834,10 +1834,8 @@ void Buffer::buildMacros()
 
 
 void Buffer::changeRefsIfUnique(docstring const & from, docstring const & to,
-	int inset_code)
+	InsetCode code)
 {
-	InsetCode code = static_cast<InsetCode>(inset_code);
-
 	//FIXME: This does not work for child documents yet.
 	BOOST_ASSERT(code == CITE_CODE || code == REF_CODE);
 	// Check if the label 'from' appears more than once
diff --git a/src/Buffer.h b/src/Buffer.h
index 5634a7ecc6..37a2670265 100644
--- a/src/Buffer.h
+++ b/src/Buffer.h
@@ -12,6 +12,8 @@
 #ifndef BUFFER_H
 #define BUFFER_H
 
+#include "insets/InsetCode.h"
+
 #include "support/FileName.h"
 #include "support/limited_stack.h"
 #include "support/types.h"
@@ -366,11 +368,8 @@ public:
 
 	/// Replace the inset contents for insets which InsetCode is equal
 	/// to the passed \p inset_code.
-	/// FIXME: we pass InsetCode as an int in order to avoid the inclusion
-	/// of "Inset.h". It would be better to put InsetCode in its own
-	/// header.
 	void changeRefsIfUnique(docstring const & from, docstring const & to,
-		int inset_code);
+		InsetCode code);
 
 /// get source code (latex/docbook) for some paragraphs, or all paragraphs
 /// including preamble