diff --git a/ridlbe/c++11/templates/cli/src/header.erb b/ridlbe/c++11/templates/cli/src/header.erb
new file mode 100644
index 00000000..c3b5da61
--- /dev/null
+++ b/ridlbe/c++11/templates/cli/src/header.erb
@@ -0,0 +1,7 @@
+/**
+ * ****  Code generated by the RIDL Compiler ****
+ * RIDL has been developed by:
+ *        Remedy IT Expertise BV
+ *        The Netherlands
+ *        https://www.remedy.nl
+ */
diff --git a/ridlbe/c++11/templates/cli/src/pre.erb b/ridlbe/c++11/templates/cli/src/pre.erb
index 568c53ae..0aad67c1 100644
--- a/ridlbe/c++11/templates/cli/src/pre.erb
+++ b/ridlbe/c++11/templates/cli/src/pre.erb
@@ -1,11 +1,3 @@
-/**
- * ****  Code generated by the RIDL Compiler ****
- * RIDL has been developed by:
- *        Remedy IT Expertise BV
- *        The Netherlands
- *        https://www.remedy.nl
- */
-
 % pre_includes.each do |incfile|
 #include "<%= incfile %>"
 % end
diff --git a/ridlbe/c++11/visitors/pre_post.rb b/ridlbe/c++11/visitors/pre_post.rb
index d8303c2f..c81815fb 100644
--- a/ridlbe/c++11/visitors/pre_post.rb
+++ b/ridlbe/c++11/visitors/pre_post.rb
@@ -20,5 +20,11 @@ def visit
         visit_template(:post)
       end
     end
+
+    class HeaderVisitor < VisitorBase
+      def visit
+        visit_template(:header)
+      end
+    end
   end
 end
diff --git a/ridlbe/c++11/writers/stubproxysource.rb b/ridlbe/c++11/writers/stubproxysource.rb
index e2f64a90..5a4e2a7d 100644
--- a/ridlbe/c++11/writers/stubproxysource.rb
+++ b/ridlbe/c++11/writers/stubproxysource.rb
@@ -256,6 +256,7 @@ def post_visit(_parser)
         properties[:pre_includes] = @default_pre_includes
         properties[:post_includes] = @default_post_includes
         properties[:includes] = @includes
+        visitor(HeaderVisitor).visit
         visitor(IncludeStubProxyDefineVisitor).visit
         visitor(PreVisitor).visit
       end
diff --git a/ridlbe/c++11/writers/stubsource.rb b/ridlbe/c++11/writers/stubsource.rb
index ab4cb6c8..e8129e39 100644
--- a/ridlbe/c++11/writers/stubsource.rb
+++ b/ridlbe/c++11/writers/stubsource.rb
@@ -219,6 +219,7 @@ def post_visit(_parser)
         properties[:pre_includes] = @default_pre_includes
         properties[:post_includes] = @default_post_includes
         properties[:includes] = @includes
+        visitor(HeaderVisitor).visit
         visitor(IncludeStubProxyDefineVisitor).visit unless params[:gen_client_proxy_source]
         visitor(PreVisitor).visit
       end