diff --git a/activemq-core/src/gram/script/GenerateCppHeaders.groovy b/activemq-core/src/gram/script/GenerateCppHeaders.groovy
index 4a79bbabfb..cf7a60f86d 100755
--- a/activemq-core/src/gram/script/GenerateCppHeaders.groovy
+++ b/activemq-core/src/gram/script/GenerateCppHeaders.groovy
@@ -79,8 +79,8 @@ for (property in properties)
     }
 }
 out << """
-#include "util/ifr/ap"
-#include "util/ifr/p"
+#include "util/ifr/ap.hpp"
+#include "util/ifr/p.hpp"
 
 namespace apache
 {
diff --git a/activemq-core/src/gram/script/GenerateCppMarshallingHeaders.groovy b/activemq-core/src/gram/script/GenerateCppMarshallingHeaders.groovy
index b2a4b9d0ac..6f85f946a4 100755
--- a/activemq-core/src/gram/script/GenerateCppMarshallingHeaders.groovy
+++ b/activemq-core/src/gram/script/GenerateCppMarshallingHeaders.groovy
@@ -58,7 +58,7 @@ class GenerateCppMarshallingHeaders extends OpenWireCppMarshallingHeadersScript
 #include "io/BinaryWriter.hpp"
 
 #include "command/${baseClass}.hpp"
-#include "util/ifr/p"
+#include "util/ifr/p.hpp"
 
 namespace apache
 {