diff --git a/CMakeLists.txt b/CMakeLists.txt
index b1daef4..5d93eff 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,10 +1,10 @@
-cmake_minimum_required(VERSION 3.0.0)
+cmake_minimum_required(VERSION 3.0.1)
 project(mumsi)
 
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
 
 INCLUDE(FindPkgConfig)
-find_package(Boost COMPONENTS system unit_test_framework program_options filesystem REQUIRED)
+find_package(Boost COMPONENTS system REQUIRED)
 find_package(PkgConfig REQUIRED)
 
 pkg_check_modules(PJSIP "libpjproject")
@@ -25,20 +25,9 @@ set(SOURCE_FILES
         Configuration.cpp
         Configuration.hpp)
 
-#set(TEST_SOURCE_FILES
-#        SoundSampleQueueTest.cpp
-#)
-
 add_executable(mumsi ${SOURCE_FILES} main.cpp)
 target_link_libraries(mumsi ${PJSIP_LIBRARIES})
 target_link_libraries(mumsi ${LOG4CPP_LIBRARIES})
 target_link_libraries(mumsi ${Boost_LIBRARIES})
 target_link_libraries(mumsi mumlib)
 
-#add_executable(mumsi_test ${SOURCE_FILES} ${TEST_SOURCE_FILES} test_main.cpp)
-#target_link_libraries(mumsi_test ${OPUS_LIBRARIES})
-#target_link_libraries(mumsi_test ${PJSIP_LIBRARIES})
-#target_link_libraries(mumsi_test ${LOG4CPP_LIBRARIES})
-#target_link_libraries(mumsi_test ${SNDFILE_LIBRARIES})
-#target_link_libraries(mumsi_test ${Boost_LIBRARIES})
-#target_link_libraries(mumsi_test mumble)
diff --git a/Configuration.cpp b/Configuration.cpp
index 2702747..4589d69 100644
--- a/Configuration.cpp
+++ b/Configuration.cpp
@@ -1,8 +1,9 @@
-#include <fstream>
+#include "Configuration.hpp"
+
 #include <boost/property_tree/ptree.hpp>
 #include <boost/property_tree/ini_parser.hpp>
 
-#include "Configuration.hpp"
+#include <fstream>
 
 using namespace config;
 
diff --git a/Configuration.hpp b/Configuration.hpp
index b08a526..8c38acb 100644
--- a/Configuration.hpp
+++ b/Configuration.hpp
@@ -1,10 +1,11 @@
 #pragma once
 
+#include <boost/noncopyable.hpp>
+
+#include <vector>
 #include <string>
 #include <stdexcept>
 
-#include <boost/noncopyable.hpp>
-
 namespace config {
 
     class ConfigException : public std::runtime_error {
diff --git a/MumbleCommunicator.cpp b/MumbleCommunicator.cpp
index 4d0ba55..07d15ed 100644
--- a/MumbleCommunicator.cpp
+++ b/MumbleCommunicator.cpp
@@ -1,8 +1,8 @@
+#include "MumbleCommunicator.hpp"
+
 #include <cstring>
 #include <functional>
 
-#include "MumbleCommunicator.hpp"
-
 namespace mumble {
     class MumlibCallback : public mumlib::BasicCallback {
     public:
diff --git a/MumbleCommunicator.hpp b/MumbleCommunicator.hpp
index de37dfd..7065f4b 100644
--- a/MumbleCommunicator.hpp
+++ b/MumbleCommunicator.hpp
@@ -4,9 +4,11 @@
 
 #include <mumlib.hpp>
 
+#include <log4cpp/Category.hh>
+#include <boost/noncopyable.hpp>
+
 #include <string>
 #include <stdexcept>
-#include <log4cpp/Category.hh>
 
 namespace mumble {
 
@@ -17,7 +19,7 @@ namespace mumble {
 
     class MumlibCallback;
 
-    class MumbleCommunicator : public ICommunicator {
+    class MumbleCommunicator : public ICommunicator, boost::noncopyable {
     public:
         MumbleCommunicator(
                 boost::asio::io_service &ioService);
diff --git a/PjsuaCommunicator.cpp b/PjsuaCommunicator.cpp
index a3f3d74..d45cd23 100644
--- a/PjsuaCommunicator.cpp
+++ b/PjsuaCommunicator.cpp
@@ -2,7 +2,8 @@
 
 #include <pjlib.h>
 #include <pjsua-lib/pjsua.h>
-#include <boost/algorithm/string/replace.hpp>
+
+#include <boost/algorithm/string.hpp>
 #include <boost/format.hpp>
 
 using namespace std;
diff --git a/PjsuaCommunicator.hpp b/PjsuaCommunicator.hpp
index ba47280..195c51b 100644
--- a/PjsuaCommunicator.hpp
+++ b/PjsuaCommunicator.hpp
@@ -4,12 +4,12 @@
 
 #include <pjmedia.h>
 
+#include <log4cpp/Category.hh>
+#include <boost/noncopyable.hpp>
+
 #include <string>
 #include <stdexcept>
-#include <log4cpp/Category.hh>
-#include <sndfile.hh>
 #include <mutex>
-#include <condition_variable>
 
 namespace sip {
 
@@ -47,7 +47,7 @@ namespace sip {
 
     pj_status_t MediaPort_putFrameRawCallback(pjmedia_port *port, pjmedia_frame *frame);
 
-    class PjsuaCommunicator : public ICommunicator {
+    class PjsuaCommunicator : public ICommunicator, boost::noncopyable {
     public:
         PjsuaCommunicator();