diff --git a/src/jhd1313m1/CMakeLists.txt b/src/jhd1313m1/CMakeLists.txt
index eaa7f00c..f506cf14 100644
--- a/src/jhd1313m1/CMakeLists.txt
+++ b/src/jhd1313m1/CMakeLists.txt
@@ -2,7 +2,7 @@ upm_mixed_module_init (NAME jhd1313m1
     DESCRIPTION "LCD Display Driver for the JHD1313M1 Controller for HD44780-based Displays"
     C_HDR jhd1313m1.h
     C_SRC jhd1313m1.c
-    CPP_HDR jhd1313m1.hpp
+    CPP_HDR jhd1313m1.hxx
     CPP_SRC jhd1313m1.cxx
 #    FTI_SRC jhd1313m1_fti.c
     CPP_WRAPS_C
diff --git a/src/jhd1313m1/javaupm_jhd1313m1.i b/src/jhd1313m1/javaupm_jhd1313m1.i
index 90da6256..6e6de738 100644
--- a/src/jhd1313m1/javaupm_jhd1313m1.i
+++ b/src/jhd1313m1/javaupm_jhd1313m1.i
@@ -23,9 +23,9 @@
 }
 
 %include "jhd1313m1.h"
-%include "jhd1313m1.hpp"
+%include "jhd1313m1.hxx"
 %{
-    #include "jhd1313m1.hpp"
+    #include "jhd1313m1.hxx"
 %}
 
 %pragma(java) jniclasscode=%{
diff --git a/src/jhd1313m1/jhd1313m1.cxx b/src/jhd1313m1/jhd1313m1.cxx
index 85118045..297c31c7 100644
--- a/src/jhd1313m1/jhd1313m1.cxx
+++ b/src/jhd1313m1/jhd1313m1.cxx
@@ -35,7 +35,7 @@
 #include <stdexcept>
 #include <unistd.h>
 
-#include "jhd1313m1.hpp"
+#include "jhd1313m1.hxx"
 
 using namespace upm;
 
diff --git a/src/jhd1313m1/jhd1313m1.hpp b/src/jhd1313m1/jhd1313m1.hxx
similarity index 100%
rename from src/jhd1313m1/jhd1313m1.hpp
rename to src/jhd1313m1/jhd1313m1.hxx
diff --git a/src/jhd1313m1/jsupm_jhd1313m1.i b/src/jhd1313m1/jsupm_jhd1313m1.i
index 479e3bd8..84d56729 100644
--- a/src/jhd1313m1/jsupm_jhd1313m1.i
+++ b/src/jhd1313m1/jsupm_jhd1313m1.i
@@ -3,7 +3,7 @@
 %include "../carrays_uint8_t.i"
 
 %include "jhd1313m1.h"
-%include "jhd1313m1.hpp"
+%include "jhd1313m1.hxx"
 %{
-    #include "jhd1313m1.hpp"
+    #include "jhd1313m1.hxx"
 %}
diff --git a/src/jhd1313m1/pyupm_jhd1313m1.i b/src/jhd1313m1/pyupm_jhd1313m1.i
index a1c66dda..dae5fc5e 100644
--- a/src/jhd1313m1/pyupm_jhd1313m1.i
+++ b/src/jhd1313m1/pyupm_jhd1313m1.i
@@ -7,7 +7,7 @@
 %feature("autodoc", "3");
 
 %include "jhd1313m1.h"
-%include "jhd1313m1.hpp"
+%include "jhd1313m1.hxx"
 %{
-    #include "jhd1313m1.hpp"
+    #include "jhd1313m1.hxx"
 %}
diff --git a/src/lcm1602/CMakeLists.txt b/src/lcm1602/CMakeLists.txt
index 954f8d1e..c9ade019 100644
--- a/src/lcm1602/CMakeLists.txt
+++ b/src/lcm1602/CMakeLists.txt
@@ -2,7 +2,7 @@ upm_mixed_module_init (NAME lcm1602
     DESCRIPTION "LCD Display Driver for the LCM1602 Controller for HD44780-based Displays"
     C_HDR lcm1602.h
     C_SRC lcm1602.c
-    CPP_HDR lcm1602.hpp
+    CPP_HDR lcm1602.hxx
     CPP_SRC lcm1602.cxx
 #    FTI_SRC lcm1602_fti.c
     CPP_WRAPS_C
diff --git a/src/lcm1602/javaupm_lcm1602.i b/src/lcm1602/javaupm_lcm1602.i
index fda24efb..ccb488e6 100644
--- a/src/lcm1602/javaupm_lcm1602.i
+++ b/src/lcm1602/javaupm_lcm1602.i
@@ -23,10 +23,10 @@
 }
 
 %include "lcm1602.h"
-%include "lcm1602.hpp"
+%include "lcm1602.hxx"
 
 %{
-    #include "lcm1602.hpp"
+    #include "lcm1602.hxx"
 %}
 
 %pragma(java) jniclasscode=%{
diff --git a/src/lcm1602/jsupm_lcm1602.i b/src/lcm1602/jsupm_lcm1602.i
index a7d61a7b..d8cf332c 100644
--- a/src/lcm1602/jsupm_lcm1602.i
+++ b/src/lcm1602/jsupm_lcm1602.i
@@ -3,7 +3,7 @@
 %include "../carrays_uint8_t.i"
 
 %include "lcm1602.h"
-%include "lcm1602.hpp"
+%include "lcm1602.hxx"
 %{
-    #include "lcm1602.hpp"
+    #include "lcm1602.hxx"
 %}
diff --git a/src/lcm1602/lcm1602.cxx b/src/lcm1602/lcm1602.cxx
index 2ce7f1f0..e8c84b0e 100644
--- a/src/lcm1602/lcm1602.cxx
+++ b/src/lcm1602/lcm1602.cxx
@@ -35,7 +35,7 @@
 #include <stdexcept>
 #include <unistd.h>
 
-#include "lcm1602.hpp"
+#include "lcm1602.hxx"
 
 using namespace upm;
 
diff --git a/src/lcm1602/lcm1602.hpp b/src/lcm1602/lcm1602.hxx
similarity index 100%
rename from src/lcm1602/lcm1602.hpp
rename to src/lcm1602/lcm1602.hxx
diff --git a/src/lcm1602/pyupm_lcm1602.i b/src/lcm1602/pyupm_lcm1602.i
index 41acbe58..9cfe88bf 100644
--- a/src/lcm1602/pyupm_lcm1602.i
+++ b/src/lcm1602/pyupm_lcm1602.i
@@ -7,7 +7,7 @@
 %feature("autodoc", "3");
 
 %include "lcm1602.h"
-%include "lcm1602.hpp"
+%include "lcm1602.hxx"
 %{
-    #include "lcm1602.hpp"
+    #include "lcm1602.hxx"
 %}