diff --git a/common/endian.hpp b/common/endian.hpp
index 505787f4..0cd0778e 100644
--- a/common/endian.hpp
+++ b/common/endian.hpp
@@ -1,6 +1,8 @@
 #ifndef ENDIAN_HPP
 #define ENDIAN_HPP
 
+#include <cstdint>
+
 #ifdef IS_BIG_ENDIAN
 #	define SWAP_16(x) (__builtin_bswap16(x))
 #	define SWAP_32(x) (__builtin_bswap32(x))
diff --git a/common/utils/file_utils.h b/common/utils/file_utils.h
index aeb255d8..cf3c66f8 100644
--- a/common/utils/file_utils.h
+++ b/common/utils/file_utils.h
@@ -24,7 +24,7 @@
 #include <stdexcept>
 #include <vector>
 #include <fstream>
-#include "common/utils/string_utils.h"
+#include "string_utils.h"
 
 
 namespace utils
diff --git a/server/CMakeLists.txt b/server/CMakeLists.txt
index c87dee7e..f34b3a1c 100644
--- a/server/CMakeLists.txt
+++ b/server/CMakeLists.txt
@@ -8,6 +8,7 @@ set(SERVER_SOURCES
     streamSession.cpp
     encoder/encoderFactory.cpp
     encoder/pcmEncoder.cpp
+    streamreader/base64.cpp
     streamreader/streamUri.cpp
     streamreader/streamManager.cpp
     streamreader/pcmStream.cpp
diff --git a/server/Makefile b/server/Makefile
index e310ca0e..b80a6628 100644
--- a/server/Makefile
+++ b/server/Makefile
@@ -36,7 +36,7 @@ DEBUG=-O3
 
 CXXFLAGS += $(ADD_CFLAGS) -std=c++0x -Wall -Wno-unused-function $(DEBUG) -DHAS_FLAC -DHAS_OGG -DHAS_VORBIS -DHAS_VORBIS_ENC -DASIO_STANDALONE -DVERSION=\"$(VERSION)\" -I. -I.. -isystem ../externals/asio/asio/include -I../externals/popl/include -I../externals/aixlog/include -I../externals -I../common
 LDFLAGS   = -lvorbis -lvorbisenc -logg -lFLAC 
-OBJ       = snapServer.o config.o controlServer.o controlSession.o jsonrp.o streamServer.o streamSession.o streamreader/streamUri.o streamreader/streamManager.o streamreader/pcmStream.o streamreader/pipeStream.o streamreader/fileStream.o streamreader/processStream.o streamreader/airplayStream.o streamreader/spotifyStream.o streamreader/watchdog.o encoder/encoderFactory.o encoder/flacEncoder.o encoder/pcmEncoder.o encoder/oggEncoder.o ../common/sampleFormat.o ../common/base64.o
+OBJ       = snapServer.o config.o controlServer.o controlSession.o jsonrp.o streamServer.o streamSession.o streamreader/streamUri.o streamreader/base64.o streamreader/streamManager.o streamreader/pcmStream.o streamreader/pipeStream.o streamreader/fileStream.o streamreader/processStream.o streamreader/airplayStream.o streamreader/spotifyStream.o streamreader/watchdog.o encoder/encoderFactory.o encoder/flacEncoder.o encoder/pcmEncoder.o encoder/oggEncoder.o ../common/sampleFormat.o
 
 ifneq (,$(TARGET))
 CXXFLAGS += -D$(TARGET)
diff --git a/server/streamreader/airplayStream.cpp b/server/streamreader/airplayStream.cpp
index eb7dba4b..7678d7d7 100644
--- a/server/streamreader/airplayStream.cpp
+++ b/server/streamreader/airplayStream.cpp
@@ -20,7 +20,7 @@
 #include "common/snapException.h"
 #include "common/utils/string_utils.h"
 #include "common/utils.h"
-#include "common/base64.h"
+#include "base64.h"
 #include "aixlog.hpp"
 
 using namespace std;
diff --git a/common/base64.cpp b/server/streamreader/base64.cpp
similarity index 99%
rename from common/base64.cpp
rename to server/streamreader/base64.cpp
index 37608703..c8b4ba0d 100644
--- a/common/base64.cpp
+++ b/server/streamreader/base64.cpp
@@ -24,7 +24,7 @@
    René Nyffenegger rene.nyffenegger@adp-gmbh.ch
 
 */
-#include <common/base64.h>
+#include "base64.h"
 
 static const std::string base64_chars = 
              "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
diff --git a/common/base64.h b/server/streamreader/base64.h
similarity index 100%
rename from common/base64.h
rename to server/streamreader/base64.h