diff --git a/client/browseZeroConf/browse_bonjour.cpp b/client/browseZeroConf/browse_bonjour.cpp
index 485399ba..a1d65168 100644
--- a/client/browseZeroConf/browse_bonjour.cpp
+++ b/client/browseZeroConf/browse_bonjour.cpp
@@ -1,4 +1,4 @@
-#include "browseBonjour.h"
+#include "browse_bonjour.hpp"
 
 #include <deque>
 #include <iostream>
diff --git a/client/browseZeroConf/browse_mdns.hpp b/client/browseZeroConf/browse_mdns.hpp
index a203b92e..85912bfc 100644
--- a/client/browseZeroConf/browse_mdns.hpp
+++ b/client/browseZeroConf/browse_mdns.hpp
@@ -30,7 +30,7 @@ public:
 #include "browse_avahi.hpp"
 typedef BrowseAvahi BrowseZeroConf;
 #elif defined(HAS_BONJOUR)
-#include "browseBonjour.h"
+#include "browse_bonjour.hpp"
 typedef BrowseBonjour BrowseZeroConf;
 #endif
 
diff --git a/client/controller.hpp b/client/controller.hpp
index e4a8b8e0..5374c686 100644
--- a/client/controller.hpp
+++ b/client/controller.hpp
@@ -19,7 +19,7 @@
 #ifndef CONTROLLER_H
 #define CONTROLLER_H
 
-#include "decoder/decoder.h"
+#include "decoder/decoder.hpp"
 #include "message/message.h"
 #include "message/serverSettings.h"
 #include "message/streamTags.h"
@@ -29,9 +29,9 @@
 #ifdef HAS_ALSA
 #include "player/alsa_player.hpp"
 #elif HAS_OPENSL
-#include "player/openslPlayer.h"
+#include "player/opensl_player.hpp"
 #elif HAS_COREAUDIO
-#include "player/coreAudioPlayer.h"
+#include "player/coreaudio_player.hpp"
 #endif
 #include "client_connection.hpp"
 #include "metadata.hpp"
diff --git a/client/decoder/decoder.h b/client/decoder/decoder.hpp
similarity index 100%
rename from client/decoder/decoder.h
rename to client/decoder/decoder.hpp
diff --git a/client/decoder/flac_decoder.hpp b/client/decoder/flac_decoder.hpp
index 2b34e46f..fc9129c1 100644
--- a/client/decoder/flac_decoder.hpp
+++ b/client/decoder/flac_decoder.hpp
@@ -19,7 +19,7 @@
 #ifndef FLAC_DECODER_H
 #define FLAC_DECODER_H
 
-#include "decoder.h"
+#include "decoder.hpp"
 
 #include <FLAC/stream_decoder.h>
 #include <atomic>
diff --git a/client/decoder/ogg_decoder.hpp b/client/decoder/ogg_decoder.hpp
index 6393142c..68a26717 100644
--- a/client/decoder/ogg_decoder.hpp
+++ b/client/decoder/ogg_decoder.hpp
@@ -18,7 +18,7 @@
 
 #ifndef OGG_DECODER_H
 #define OGG_DECODER_H
-#include "decoder.h"
+#include "decoder.hpp"
 #ifdef HAS_TREMOR
 #include <tremor/ivorbiscodec.h>
 #else
diff --git a/client/decoder/pcm_decoder.hpp b/client/decoder/pcm_decoder.hpp
index f4c58464..78099bae 100644
--- a/client/decoder/pcm_decoder.hpp
+++ b/client/decoder/pcm_decoder.hpp
@@ -18,7 +18,7 @@
 
 #ifndef PCM_DECODER_H
 #define PCM_DECODER_H
-#include "decoder.h"
+#include "decoder.hpp"
 
 
 class PcmDecoder : public Decoder
diff --git a/client/player/coreaudio_player.cpp b/client/player/coreaudio_player.cpp
index 2f6f3b77..71ffb090 100644
--- a/client/player/coreaudio_player.cpp
+++ b/client/player/coreaudio_player.cpp
@@ -16,8 +16,7 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-//#include <CoreServices/CoreServices.h>
-#include "coreAudioPlayer.h"
+#include "coreaudio_player.hpp"
 #include <CoreAudio/CoreAudio.h>
 
 #define NUM_BUFFERS 2
diff --git a/client/player/opensl_player.cpp b/client/player/opensl_player.cpp
index d238b7a1..4321e901 100644
--- a/client/player/opensl_player.cpp
+++ b/client/player/opensl_player.cpp
@@ -22,7 +22,7 @@
 #include "common/aixlog.hpp"
 #include "common/snap_exception.hpp"
 #include "common/str_compat.hpp"
-#include "openslPlayer.h"
+#include "opensl_player.hpp"
 
 using namespace std;
 
diff --git a/client/stream.hpp b/client/stream.hpp
index 110c5696..90ef192d 100644
--- a/client/stream.hpp
+++ b/client/stream.hpp
@@ -19,12 +19,6 @@
 #ifndef STREAM_H
 #define STREAM_H
 
-//#include <mutex>
-//#include <condition_variable>
-//#include <vector>
-//#include <chrono>
-//#include "common/timeUtils.h"
-
 #include "common/queue.h"
 #include "common/sample_format.hpp"
 #include "double_buffer.hpp"
diff --git a/server/streamreader/stream_manager.cpp b/server/streamreader/stream_manager.cpp
index 169b0904..18723ee5 100644
--- a/server/streamreader/stream_manager.cpp
+++ b/server/streamreader/stream_manager.cpp
@@ -23,9 +23,9 @@
 #include "common/str_compat.hpp"
 #include "common/utils.hpp"
 #include "file_stream.hpp"
+#include "librespot_stream.hpp"
 #include "pipe_stream.hpp"
 #include "process_stream.hpp"
-#include "librespot_stream.hpp"
 
 
 using namespace std;