diff --git a/lib/misc_utils/bursts_printer_impl.cc b/lib/misc_utils/bursts_printer_impl.cc
index 744d6ca..c22e60b 100644
--- a/lib/misc_utils/bursts_printer_impl.cc
+++ b/lib/misc_utils/bursts_printer_impl.cc
@@ -30,7 +30,7 @@
 #include <iterator>
 #include <algorithm>
 #include "bursts_printer_impl.h"
-#include <unistd.h>
+//#include <unistd.h>
 #include <iostream>
 extern "C" {
     #include <osmocom/gsm/a5.h>
diff --git a/lib/misc_utils/collect_system_info_impl.cc b/lib/misc_utils/collect_system_info_impl.cc
index 2f46041..072734a 100644
--- a/lib/misc_utils/collect_system_info_impl.cc
+++ b/lib/misc_utils/collect_system_info_impl.cc
@@ -26,7 +26,7 @@
 
 #include <gnuradio/io_signature.h>
 #include <grgsm/gsmtap.h>
-#include <unistd.h>
+//#include <unistd.h>
 #include <grgsm/endian.h>
 
 #include "collect_system_info_impl.h"
diff --git a/lib/misc_utils/controlled_rotator_cc_impl.cc b/lib/misc_utils/controlled_rotator_cc_impl.cc
index e5ead1c..9cb5316 100644
--- a/lib/misc_utils/controlled_rotator_cc_impl.cc
+++ b/lib/misc_utils/controlled_rotator_cc_impl.cc
@@ -26,7 +26,6 @@
 
 #include <gnuradio/io_signature.h>
 #include "controlled_rotator_cc_impl.h"
-#include <math.h>
 
 namespace gr {
   namespace gsm {
diff --git a/lib/misc_utils/extract_cmc_impl.cc b/lib/misc_utils/extract_cmc_impl.cc
index 96e04d6..16f2f6b 100644
--- a/lib/misc_utils/extract_cmc_impl.cc
+++ b/lib/misc_utils/extract_cmc_impl.cc
@@ -26,7 +26,7 @@
 
 #include <gnuradio/io_signature.h>
 #include <grgsm/gsmtap.h>
-#include <unistd.h>
+//#include <unistd.h>
 #include <grgsm/endian.h>
 
 #include "extract_cmc_impl.h"
diff --git a/lib/misc_utils/extract_immediate_assignment_impl.cc b/lib/misc_utils/extract_immediate_assignment_impl.cc
index 125b7e8..a6d1658 100644
--- a/lib/misc_utils/extract_immediate_assignment_impl.cc
+++ b/lib/misc_utils/extract_immediate_assignment_impl.cc
@@ -26,7 +26,7 @@
 
 #include <gnuradio/io_signature.h>
 #include <grgsm/gsmtap.h>
-#include <unistd.h>
+//#include <unistd.h>
 #include <map>
 #include <grgsm/endian.h>
 #include <boost/foreach.hpp>
diff --git a/lib/misc_utils/extract_system_info_impl.cc b/lib/misc_utils/extract_system_info_impl.cc
index 2de544e..ad7adb8 100644
--- a/lib/misc_utils/extract_system_info_impl.cc
+++ b/lib/misc_utils/extract_system_info_impl.cc
@@ -26,7 +26,7 @@
 
 #include <gnuradio/io_signature.h>
 #include <grgsm/gsmtap.h>
-#include <unistd.h>
+//#include <unistd.h>
 #include <map>
 #include <iterator>
 #include <algorithm>
diff --git a/lib/receiver/receiver_config.cc b/lib/receiver/receiver_config.cc
index b5745ed..5c3363a 100644
--- a/lib/receiver/receiver_config.cc
+++ b/lib/receiver/receiver_config.cc
@@ -23,8 +23,10 @@
 #include "config.h"
 #endif
 
+#include <cmath>
 #include <receiver_config.h>
 
+
 burst_counter & burst_counter::operator++(int)
 {
   d_timeslot_nr++;
diff --git a/lib/receiver/receiver_config.h b/lib/receiver/receiver_config.h
index f68e3f6..6ad43a1 100644
--- a/lib/receiver/receiver_config.h
+++ b/lib/receiver/receiver_config.h
@@ -24,7 +24,6 @@
 
 #include <vector>
 #include <algorithm>
-#include <math.h>
 #include <stdint.h>
 #include <gsm_constants.h>
 
diff --git a/lib/receiver/viterbi_detector.cc b/lib/receiver/viterbi_detector.cc
index 4e8fb3a..6a64a2c 100644
--- a/lib/receiver/viterbi_detector.cc
+++ b/lib/receiver/viterbi_detector.cc
@@ -57,7 +57,6 @@
 
 #include <gnuradio/gr_complex.h>
 #include <gsm_constants.h>
-#include <cmath>
 
 #define PATHS_NUM (1 << (CHAN_IMP_RESP_LENGTH-1))