diff --git a/src/plugins/cppeditor/cppeditor.pro b/src/plugins/cppeditor/cppeditor.pro
index 4e37070300310c130753b89786f49a27a9d14d9c..0e86ffeb8e8dcea36449c4fb3fe59270f91eb1cd 100644
--- a/src/plugins/cppeditor/cppeditor.pro
+++ b/src/plugins/cppeditor/cppeditor.pro
@@ -19,7 +19,7 @@ HEADERS += cppplugin.h \
     cppchecksymbols.h \
     cppsemanticinfo.h \
     cppoutline.h \
-    cppdeclfromdef.h \
+    cppinsertdecldef.h \
     cpplocalsymbols.h \
     cpptypehierarchy.h \
     cppelementevaluator.h
@@ -35,7 +35,7 @@ SOURCES += cppplugin.cpp \
     cppchecksymbols.cpp \
     cppsemanticinfo.cpp \
     cppoutline.cpp \
-    cppdeclfromdef.cpp \
+    cppinsertdecldef.cpp \
     cpplocalsymbols.cpp \
     cpptypehierarchy.cpp \
     cppelementevaluator.cpp
diff --git a/src/plugins/cppeditor/cppdeclfromdef.cpp b/src/plugins/cppeditor/cppinsertdecldef.cpp
similarity index 98%
rename from src/plugins/cppeditor/cppdeclfromdef.cpp
rename to src/plugins/cppeditor/cppinsertdecldef.cpp
index f0ede56f5e462e99e371f3d67abd584249cce935..97ee79a640b6e0b6e659a9ac7b7d0b770142c528 100644
--- a/src/plugins/cppeditor/cppdeclfromdef.cpp
+++ b/src/plugins/cppeditor/cppinsertdecldef.cpp
@@ -27,10 +27,7 @@
 **
 **************************************************************************/
 
-#include "cppdeclfromdef.h"
-
-#include <Literals.h> //### remove
-#include <QDebug> //###remove
+#include "cppinsertdecldef.h"
 
 #include <AST.h>
 #include <ASTVisitor.h>
diff --git a/src/plugins/cppeditor/cppdeclfromdef.h b/src/plugins/cppeditor/cppinsertdecldef.h
similarity index 95%
rename from src/plugins/cppeditor/cppdeclfromdef.h
rename to src/plugins/cppeditor/cppinsertdecldef.h
index 8b71ef78c046b5c76c2385f3407307f34530d099..024359d0865653c1bced3a863e3b4fd7cf6cc1c2 100644
--- a/src/plugins/cppeditor/cppdeclfromdef.h
+++ b/src/plugins/cppeditor/cppinsertdecldef.h
@@ -27,8 +27,8 @@
 **
 **************************************************************************/
 
-#ifndef CPPDECLFROMDEF_H
-#define CPPDECLFROMDEF_H
+#ifndef CPPINSERTDECLDEF_H
+#define CPPINSERTDECLDEF_H
 
 #include "cppquickfix.h"
 
@@ -56,4 +56,4 @@ protected:
 } // namespace Internal
 } // namespace CppEditor
 
-#endif // CPPDECLFROMDEF_H
+#endif // CPPINSERTDECLDEF_H
diff --git a/src/plugins/cppeditor/cppquickfix.cpp b/src/plugins/cppeditor/cppquickfix.cpp
index 9d1c08060936b7b8275d23f4986f821e14d73693..eb5dce7a114acf697d0410b8a6eaece4679d09ae 100644
--- a/src/plugins/cppeditor/cppquickfix.cpp
+++ b/src/plugins/cppeditor/cppquickfix.cpp
@@ -29,7 +29,6 @@
 
 #include "cppquickfix.h"
 #include "cppeditor.h"
-#include "cppdeclfromdef.h"
 
 #include <AST.h>
 #include <TranslationUnit.h>
diff --git a/src/plugins/cppeditor/cppquickfixes.cpp b/src/plugins/cppeditor/cppquickfixes.cpp
index 56709c1cf6f0400bd22409d226d1a103178bcbb3..9434dcf05554114e68f523985a51b409e224add7 100644
--- a/src/plugins/cppeditor/cppquickfixes.cpp
+++ b/src/plugins/cppeditor/cppquickfixes.cpp
@@ -29,7 +29,7 @@
 
 #include "cppeditor.h"
 #include "cppquickfix.h"
-#include "cppdeclfromdef.h"
+#include "cppinsertdecldef.h"
 
 #include <ASTVisitor.h>
 #include <AST.h>