diff --git a/katran/lib/BaseBpfAdapter.cpp b/katran/lib/BaseBpfAdapter.cpp
index 69c7d511b..4940f956b 100644
--- a/katran/lib/BaseBpfAdapter.cpp
+++ b/katran/lib/BaseBpfAdapter.cpp
@@ -33,7 +33,6 @@
 
 extern "C" {
 #include <arpa/inet.h>
-#include <asm/unistd.h>
 #include <fcntl.h>
 #include <linux/if_ether.h>
 #include <linux/netlink.h>
diff --git a/katran/lib/IpHelpers.cpp b/katran/lib/IpHelpers.cpp
index 8f25c7049..98d1edf31 100644
--- a/katran/lib/IpHelpers.cpp
+++ b/katran/lib/IpHelpers.cpp
@@ -17,7 +17,6 @@
 #include "IpHelpers.h"
 
 #include <folly/lang/Bits.h>
-#include <stdexcept>
 
 namespace katran {
 
diff --git a/katran/lib/KatranEventReader.cpp b/katran/lib/KatranEventReader.cpp
index 75f9d3a26..b694658c6 100644
--- a/katran/lib/KatranEventReader.cpp
+++ b/katran/lib/KatranEventReader.cpp
@@ -15,9 +15,6 @@
  */
 #include "katran/lib/KatranEventReader.h"
 
-#include <folly/Utility.h>
-#include <unistd.h>
-
 #include "katran/lib/BalancerStructs.h"
 
 namespace katran {
diff --git a/katran/lib/KatranSimulator.cpp b/katran/lib/KatranSimulator.cpp
index b8682f135..ff98ed4d4 100644
--- a/katran/lib/KatranSimulator.cpp
+++ b/katran/lib/KatranSimulator.cpp
@@ -23,7 +23,6 @@
 #include "katran/lib/BpfAdapter.h"
 
 extern "C" {
-#include <arpa/inet.h>
 #include <linux/ipv6.h>
 #include <netinet/if_ether.h>
 #include <netinet/ip.h>
diff --git a/katran/lib/MonitoringServiceCore.cpp b/katran/lib/MonitoringServiceCore.cpp
index e84e4bc9a..600cbb53d 100644
--- a/katran/lib/MonitoringServiceCore.cpp
+++ b/katran/lib/MonitoringServiceCore.cpp
@@ -2,7 +2,6 @@
 #include "katran/lib/MonitoringServiceCore.h"
 #include <fcntl.h>
 #include <fmt/core.h>
-#include <folly/Utility.h>
 
 namespace katran {
 namespace monitoring {
diff --git a/katran/lib/PcapMsgMeta.cpp b/katran/lib/PcapMsgMeta.cpp
index 6bec8334e..f73fa11b5 100644
--- a/katran/lib/PcapMsgMeta.cpp
+++ b/katran/lib/PcapMsgMeta.cpp
@@ -15,7 +15,6 @@
  */
 #include "katran/lib/PcapMsgMeta.h"
 #include <fmt/core.h>
-#include <folly/Utility.h>
 
 namespace katran {
 
diff --git a/katran/lib/PipeWriter.cpp b/katran/lib/PipeWriter.cpp
index 773353e71..4f0758c84 100644
--- a/katran/lib/PipeWriter.cpp
+++ b/katran/lib/PipeWriter.cpp
@@ -2,7 +2,6 @@
 
 #include "katran/lib/PipeWriter.h"
 #include <folly/io/IOBuf.h>
-#include <unistd.h>
 #include <cstring>
 
 namespace katran {
diff --git a/katran/lib/testing/PcapParser.cpp b/katran/lib/testing/PcapParser.cpp
index fb075f119..15d1653f8 100644
--- a/katran/lib/testing/PcapParser.cpp
+++ b/katran/lib/testing/PcapParser.cpp
@@ -17,7 +17,6 @@
 #include "katran/lib/testing/PcapParser.h"
 
 #include <chrono>
-#include <stdexcept>
 
 #include <folly/FileUtil.h>
 #include <glog/logging.h>