diff --git a/examples/c++/ds18b20.cxx b/examples/c++/ds18b20.cxx
index ce53d580..f1eaa8c3 100644
--- a/examples/c++/ds18b20.cxx
+++ b/examples/c++/ds18b20.cxx
@@ -26,7 +26,7 @@
 #include <iostream>
 #include <signal.h>
 
-#include "ds18b20.h"
+#include "ds18b20.hpp"
 
 using namespace std;
 
diff --git a/src/ds18b20/CMakeLists.txt b/src/ds18b20/CMakeLists.txt
index f8f38a83..988d2783 100644
--- a/src/ds18b20/CMakeLists.txt
+++ b/src/ds18b20/CMakeLists.txt
@@ -1,5 +1,5 @@
 set (libname "ds18b20")
 set (libdescription "upm DS18B20 1-wire Temperature sensor")
 set (module_src ${libname}.cxx)
-set (module_h ${libname}.h)
+set (module_hpp ${libname}.hpp)
 upm_module_init()
diff --git a/src/ds18b20/ds18b20.cxx b/src/ds18b20/ds18b20.cxx
index 50688ae1..0848fe34 100644
--- a/src/ds18b20/ds18b20.cxx
+++ b/src/ds18b20/ds18b20.cxx
@@ -26,7 +26,7 @@
 #include <time.h>
 #include <stdexcept>
 
-#include "ds18b20.h"
+#include "ds18b20.hpp"
 
 using namespace upm;
 using namespace std;
diff --git a/src/ds18b20/ds18b20.h b/src/ds18b20/ds18b20.hpp
similarity index 100%
rename from src/ds18b20/ds18b20.h
rename to src/ds18b20/ds18b20.hpp
diff --git a/src/ds18b20/javaupm_ds18b20.i b/src/ds18b20/javaupm_ds18b20.i
index b8ee1b2c..918f6135 100644
--- a/src/ds18b20/javaupm_ds18b20.i
+++ b/src/ds18b20/javaupm_ds18b20.i
@@ -4,10 +4,10 @@
 %include "std_string.i"
 
 %{
-    #include "ds18b20.h"
+    #include "ds18b20.hpp"
 %}
 
-%include "ds18b20.h"
+%include "ds18b20.hpp"
 %array_class(char, charArray);
 
 %pragma(java) jniclasscode=%{
diff --git a/src/ds18b20/jsupm_ds18b20.i b/src/ds18b20/jsupm_ds18b20.i
index ac4cb95d..8f882b6b 100644
--- a/src/ds18b20/jsupm_ds18b20.i
+++ b/src/ds18b20/jsupm_ds18b20.i
@@ -4,8 +4,8 @@
 %include "std_string.i"
 
 %{
-    #include "ds18b20.h"
+    #include "ds18b20.hpp"
 %}
 
-%include "ds18b20.h"
+%include "ds18b20.hpp"
 %array_class(char, charArray);
diff --git a/src/ds18b20/pyupm_ds18b20.i b/src/ds18b20/pyupm_ds18b20.i
index 0cdd96ea..3a4ac70e 100644
--- a/src/ds18b20/pyupm_ds18b20.i
+++ b/src/ds18b20/pyupm_ds18b20.i
@@ -6,7 +6,7 @@
 %feature("autodoc", "3");
 
 %{
-    #include "ds18b20.h"
+    #include "ds18b20.hpp"
 %}
-%include "ds18b20.h"
+%include "ds18b20.hpp"
 %array_class(char, charArray);