diff --git a/examples/c++/ds2413.cxx b/examples/c++/ds2413.cxx
index bb6f1022..04fdcb6e 100644
--- a/examples/c++/ds2413.cxx
+++ b/examples/c++/ds2413.cxx
@@ -25,7 +25,7 @@
 #include <unistd.h>
 #include <iostream>
 #include <stdio.h>
-#include "ds2413.h"
+#include "ds2413.hpp"
 
 using namespace std;
 using namespace upm;
diff --git a/src/ds2413/CMakeLists.txt b/src/ds2413/CMakeLists.txt
index 1d702b56..b176d034 100644
--- a/src/ds2413/CMakeLists.txt
+++ b/src/ds2413/CMakeLists.txt
@@ -1,5 +1,5 @@
 set (libname "ds2413")
 set (libdescription "upm DS2413 1-wire Dual Channel Addressable Switch module")
 set (module_src ${libname}.cxx)
-set (module_h ${libname}.h)
+set (module_hpp ${libname}.hpp)
 upm_module_init()
diff --git a/src/ds2413/ds2413.cxx b/src/ds2413/ds2413.cxx
index a708a799..24f27957 100644
--- a/src/ds2413/ds2413.cxx
+++ b/src/ds2413/ds2413.cxx
@@ -26,7 +26,7 @@
 #include <time.h>
 #include <stdexcept>
 
-#include "ds2413.h"
+#include "ds2413.hpp"
 
 using namespace upm;
 using namespace std;
diff --git a/src/ds2413/ds2413.h b/src/ds2413/ds2413.hpp
similarity index 100%
rename from src/ds2413/ds2413.h
rename to src/ds2413/ds2413.hpp
diff --git a/src/ds2413/javaupm_ds2413.i b/src/ds2413/javaupm_ds2413.i
index 687014a9..c8469508 100644
--- a/src/ds2413/javaupm_ds2413.i
+++ b/src/ds2413/javaupm_ds2413.i
@@ -4,10 +4,10 @@
 %include "std_string.i"
 
 %{
-    #include "ds2413.h"
+    #include "ds2413.hpp"
 %}
 
-%include "ds2413.h"
+%include "ds2413.hpp"
 %array_class(char, charArray);
 
 %pragma(java) jniclasscode=%{
diff --git a/src/ds2413/jsupm_ds2413.i b/src/ds2413/jsupm_ds2413.i
index 7ecd7470..af9ffaf2 100644
--- a/src/ds2413/jsupm_ds2413.i
+++ b/src/ds2413/jsupm_ds2413.i
@@ -4,8 +4,8 @@
 %include "std_string.i"
 
 %{
-    #include "ds2413.h"
+    #include "ds2413.hpp"
 %}
 
-%include "ds2413.h"
+%include "ds2413.hpp"
 %array_class(char, charArray);
diff --git a/src/ds2413/pyupm_ds2413.i b/src/ds2413/pyupm_ds2413.i
index 62ff20ae..819f71ce 100644
--- a/src/ds2413/pyupm_ds2413.i
+++ b/src/ds2413/pyupm_ds2413.i
@@ -6,7 +6,7 @@
 %feature("autodoc", "3");
 
 %{
-    #include "ds2413.h"
+    #include "ds2413.hpp"
 %}
-%include "ds2413.h"
+%include "ds2413.hpp"
 %array_class(char, charArray);