1 files changed, 5 insertions, 3 deletions
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassIncludeDeclaration.mtl b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassIncludeDeclaration.mtl
index 9634496107a..6086e5d1951 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassIncludeDeclaration.mtl
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassIncludeDeclaration.mtl
@@ -1,4 +1,4 @@
-[module CppClassIncludeDeclaration('http://www.eclipse.org/uml2/4.0.0/UML', 'http://papyrus/C_CppProfile/1')/]
+[module CppClassIncludeDeclaration('http://www.eclipse.org/uml2/4.0.0/UML', 'http://www.eclipse.org/papyrus/C_Cpp/1')/]
 [import org::eclipse::papyrus::cpp::codegen::utils::GenUtils/]
 [import org::eclipse::papyrus::cpp::codegen::preferences::CppCodeGenUtils/]
 
@@ -8,12 +8,14 @@ if (hasStereotype(Template)) then
 	getApplication(Template).oclAsType(Template).declaration
 else
 	if (hasStereotype(ExternClass)) then getApplication(ExternClass).oclAsType(ExternClass).name
-	else ne.name + '.' + getHeaderSuffix()
+	else
+		-- standard case (no stereotypes are applied)
+		getNearestPackage().getFullPath() + '/' + ne.name + '.' + getHeaderSuffix()
 	endif
 endif
 /]
 
 [comment TODO: original code did not use nearest package, if stereotype CppRoot was applied/]
 [template public CppClassIncludeDeclaration(ne : NamedElement)]
-#include <[getNearestPackage().getFullPath()/]/[ne.includeName()/]>
+#include <[ne.includeName()/]>
 [/template]