diff --git a/audio/ess/LoadedFile.cpp b/audio/ess/LoadedFile.cpp
index 72a8e2d..b1cf051 100644
--- a/audio/ess/LoadedFile.cpp
+++ b/audio/ess/LoadedFile.cpp
@@ -5,12 +5,12 @@
  */
 
 
-#include <etk/types.h>
-#include <ethread/tools.h>
-#include <audio/ess/debug.h>
-#include <audio/ess/LoadedFile.h>
-#include <audio/ess/decWav.h>
-#include <audio/ess/decOgg.h>
+#include <etk/types.hpp>
+#include <ethread/tools.hpp>
+#include <audio/ess/debug.hpp>
+#include <audio/ess/LoadedFile.hpp>
+#include <audio/ess/decWav.hpp>
+#include <audio/ess/decOgg.hpp>
 #include <unistd.h>
 
 #if defined(__TARGET_OS__Android)
diff --git a/audio/ess/LoadedFile.h b/audio/ess/LoadedFile.hpp
similarity index 94%
rename from audio/ess/LoadedFile.h
rename to audio/ess/LoadedFile.hpp
index b3be012..01db877 100644
--- a/audio/ess/LoadedFile.h
+++ b/audio/ess/LoadedFile.hpp
@@ -5,9 +5,9 @@
  */
 #pragma once
 
-#include <etk/types.h>
+#include <etk/types.hpp>
 #include <thread>
-#include <ememory/memory.h>
+#include <ememory/memory.hpp>
 
 namespace audio {
 	namespace ess {
diff --git a/audio/ess/debug.cpp b/audio/ess/debug.cpp
index aca65e7..f482e88 100644
--- a/audio/ess/debug.cpp
+++ b/audio/ess/debug.cpp
@@ -4,7 +4,7 @@
  * @license APACHE v2.0 (see license file)
  */
 
-#include <audio/ess/debug.h>
+#include <audio/ess/debug.hpp>
 
 int32_t audio::ess::getLogId() {
 	static int32_t g_val = elog::registerInstance("audio-ess");
diff --git a/audio/ess/debug.h b/audio/ess/debug.hpp
similarity index 97%
rename from audio/ess/debug.h
rename to audio/ess/debug.hpp
index 5de1ffb..3c17665 100644
--- a/audio/ess/debug.h
+++ b/audio/ess/debug.hpp
@@ -5,7 +5,7 @@
  */
 #pragma once
 
-#include <elog/log.h>
+#include <elog/log.hpp>
 
 
 namespace audio {
diff --git a/audio/ess/decOgg.cpp b/audio/ess/decOgg.cpp
index fcba6fb..f2d720f 100644
--- a/audio/ess/decOgg.cpp
+++ b/audio/ess/decOgg.cpp
@@ -4,12 +4,12 @@
  * @license APACHE v2.0 (see license file)
  */
 
-#include <etk/types.h>
-#include <etk/os/FSNode.h>
-#include <audio/ess/debug.h>
-#include <audio/ess/decOgg.h>
-#include <tremor/ivorbiscodec.h>
-#include <tremor/ivorbisfile.h>
+#include <etk/types.hpp>
+#include <etk/os/FSNode.hpp>
+#include <audio/ess/debug.hpp>
+#include <audio/ess/decOgg.hpp>
+#include <tremor/ivorbiscodec.hpp>
+#include <tremor/ivorbisfile.hpp>
 #include <memory>
 
 
diff --git a/audio/ess/decOgg.h b/audio/ess/decOgg.hpp
similarity index 92%
rename from audio/ess/decOgg.h
rename to audio/ess/decOgg.hpp
index 9933582..b96c549 100644
--- a/audio/ess/decOgg.h
+++ b/audio/ess/decOgg.hpp
@@ -5,7 +5,7 @@
  */
 #pragma once
 
-#include <etk/types.h>
+#include <etk/types.hpp>
 
 namespace audio {
 	namespace ess {
diff --git a/audio/ess/decWav.cpp b/audio/ess/decWav.cpp
index 0e48310..e214b1c 100644
--- a/audio/ess/decWav.cpp
+++ b/audio/ess/decWav.cpp
@@ -4,10 +4,10 @@
  * @license APACHE v2.0 (see license file)
  */
 
-#include <etk/types.h>
-#include <etk/os/FSNode.h>
-#include <audio/ess/debug.h>
-#include <audio/ess/decWav.h>
+#include <etk/types.hpp>
+#include <etk/os/FSNode.hpp>
+#include <audio/ess/debug.hpp>
+#include <audio/ess/decWav.hpp>
 
 
 typedef struct {
diff --git a/audio/ess/decWav.h b/audio/ess/decWav.hpp
similarity index 92%
rename from audio/ess/decWav.h
rename to audio/ess/decWav.hpp
index 46c2555..b57e881 100644
--- a/audio/ess/decWav.h
+++ b/audio/ess/decWav.hpp
@@ -5,7 +5,7 @@
  */
 #pragma once
 
-#include <etk/types.h>
+#include <etk/types.hpp>
 
 namespace audio {
 	namespace ess {
diff --git a/audio/ess/effects.cpp b/audio/ess/effects.cpp
index b5dc189..55a38a8 100644
--- a/audio/ess/effects.cpp
+++ b/audio/ess/effects.cpp
@@ -5,12 +5,12 @@
  */
 
 
-#include <etk/types.h>
+#include <etk/types.hpp>
 
-#include <audio/ess/debug.h>
-#include <audio/ess/effects.h>
-#include <audio/ess/decWav.h>
-#include <math.h>
+#include <audio/ess/debug.hpp>
+#include <audio/ess/effects.hpp>
+#include <audio/ess/decWav.hpp>
+#include <cmath>
 
 audio::ess::Effects::Effects(const ememory::SharedPtr<audio::river::Manager>& _manager) :
   m_manager(_manager) {
diff --git a/audio/ess/effects.h b/audio/ess/effects.hpp
similarity index 88%
rename from audio/ess/effects.h
rename to audio/ess/effects.hpp
index cf381c7..62cb85f 100644
--- a/audio/ess/effects.h
+++ b/audio/ess/effects.hpp
@@ -5,11 +5,11 @@
  */
 #pragma once
 
-#include <etk/types.h>
-#include <etk/math/Vector3D.h>
-#include <audio/river/Interface.h>
-#include <audio/river/Manager.h>
-#include <audio/ess/LoadedFile.h>
+#include <etk/types.hpp>
+#include <etk/math/Vector3D.hpp>
+#include <audio/river/Interface.hpp>
+#include <audio/river/Manager.hpp>
+#include <audio/ess/LoadedFile.hpp>
 #include <mutex>
 
 namespace audio {
diff --git a/audio/ess/ess.cpp b/audio/ess/ess.cpp
index 2f6ca9e..b38a054 100644
--- a/audio/ess/ess.cpp
+++ b/audio/ess/ess.cpp
@@ -5,13 +5,13 @@
  */
 
 
-#include <etk/types.h>
+#include <etk/types.hpp>
 
-#include <audio/river/Interface.h>
-#include <audio/river/Manager.h>
-#include <audio/ess/ess.h>
-#include <audio/ess/debug.h>
-#include <ejson/ejson.h>
+#include <audio/river/Interface.hpp>
+#include <audio/river/Manager.hpp>
+#include <audio/ess/ess.hpp>
+#include <audio/ess/debug.hpp>
+#include <ejson/ejson.hpp>
 
 ememory::SharedPtr<audio::river::Manager> g_audioManager;
 ememory::SharedPtr<audio::ess::Effects> g_effects;
diff --git a/audio/ess/ess.h b/audio/ess/ess.hpp
similarity index 96%
rename from audio/ess/ess.h
rename to audio/ess/ess.hpp
index 039fa75..a2e7529 100644
--- a/audio/ess/ess.h
+++ b/audio/ess/ess.hpp
@@ -5,9 +5,9 @@
  */
 #pragma once
 
-#include <etk/types.h>
-#include <audio/ess/effects.h>
-#include <audio/ess/music.h>
+#include <etk/types.hpp>
+#include <audio/ess/effects.hpp>
+#include <audio/ess/music.hpp>
 /**
  * @brief Audio library namespace
  */
diff --git a/audio/ess/music.cpp b/audio/ess/music.cpp
index 364b773..5c318c5 100644
--- a/audio/ess/music.cpp
+++ b/audio/ess/music.cpp
@@ -5,12 +5,12 @@
  */
 
 
-#include <etk/types.h>
+#include <etk/types.hpp>
 
-#include <audio/ess/music.h>
-#include <audio/ess/debug.h>
-#include <audio/ess/LoadedFile.h>
-#include <math.h>
+#include <audio/ess/music.hpp>
+#include <audio/ess/debug.hpp>
+#include <audio/ess/LoadedFile.hpp>
+#include <cmath>
 
 audio::ess::Music::Music(const ememory::SharedPtr<audio::river::Manager>& _manager) :
   m_manager(_manager),
diff --git a/audio/ess/music.h b/audio/ess/music.hpp
similarity index 90%
rename from audio/ess/music.h
rename to audio/ess/music.hpp
index 233023b..3adf8b7 100644
--- a/audio/ess/music.h
+++ b/audio/ess/music.hpp
@@ -5,10 +5,10 @@
  */
 #pragma once
 
-#include <etk/types.h>
-#include <audio/river/Interface.h>
-#include <audio/river/Manager.h>
-#include <audio/ess/LoadedFile.h>
+#include <etk/types.hpp>
+#include <audio/river/Interface.hpp>
+#include <audio/river/Manager.hpp>
+#include <audio/ess/LoadedFile.hpp>
 #include <mutex>
 #include <map>