diff --git a/lib/cli/agentaddcommand.cpp b/lib/cli/agentaddcommand.cpp
index 75623033c..992e4d6ec 100644
--- a/lib/cli/agentaddcommand.cpp
+++ b/lib/cli/agentaddcommand.cpp
@@ -26,8 +26,6 @@
 #include <boost/algorithm/string/replace.hpp>
 #include <fstream>
 #include <vector>
-#include <string>
-#include <unistd.h>
 
 using namespace icinga;
 namespace po = boost::program_options;
diff --git a/lib/cli/agentlistcommand.cpp b/lib/cli/agentlistcommand.cpp
index c309fc37a..8163f9edb 100644
--- a/lib/cli/agentlistcommand.cpp
+++ b/lib/cli/agentlistcommand.cpp
@@ -26,8 +26,6 @@
 #include <boost/algorithm/string/replace.hpp>
 #include <fstream>
 #include <vector>
-#include <string>
-#include <unistd.h>
 
 using namespace icinga;
 namespace po = boost::program_options;
diff --git a/lib/cli/agentremovecommand.cpp b/lib/cli/agentremovecommand.cpp
index 68569f12a..aa082738b 100644
--- a/lib/cli/agentremovecommand.cpp
+++ b/lib/cli/agentremovecommand.cpp
@@ -26,8 +26,6 @@
 #include <boost/algorithm/string/replace.hpp>
 #include <fstream>
 #include <vector>
-#include <string>
-#include <unistd.h>
 
 using namespace icinga;
 namespace po = boost::program_options;
diff --git a/lib/cli/agentsetcommand.cpp b/lib/cli/agentsetcommand.cpp
index 275287f57..8f658bcc5 100644
--- a/lib/cli/agentsetcommand.cpp
+++ b/lib/cli/agentsetcommand.cpp
@@ -26,8 +26,6 @@
 #include <boost/algorithm/string/replace.hpp>
 #include <fstream>
 #include <vector>
-#include <string>
-#include <unistd.h>
 
 using namespace icinga;
 namespace po = boost::program_options;
diff --git a/lib/cli/agentsetupcommand.cpp b/lib/cli/agentsetupcommand.cpp
index 7da0fc1e3..11c06acc9 100644
--- a/lib/cli/agentsetupcommand.cpp
+++ b/lib/cli/agentsetupcommand.cpp
@@ -26,8 +26,6 @@
 #include <boost/algorithm/string/replace.hpp>
 #include <fstream>
 #include <vector>
-#include <string>
-#include <unistd.h>
 
 using namespace icinga;
 namespace po = boost::program_options;
diff --git a/lib/cli/agentupdateconfigcommand.cpp b/lib/cli/agentupdateconfigcommand.cpp
index 0e5af159d..8a80d7b5a 100644
--- a/lib/cli/agentupdateconfigcommand.cpp
+++ b/lib/cli/agentupdateconfigcommand.cpp
@@ -26,8 +26,6 @@
 #include <boost/algorithm/string/replace.hpp>
 #include <fstream>
 #include <vector>
-#include <string>
-#include <unistd.h>
 
 using namespace icinga;
 namespace po = boost::program_options;
diff --git a/lib/cli/agentutility.cpp b/lib/cli/agentutility.cpp
index a05e08cb9..09b90451c 100644
--- a/lib/cli/agentutility.cpp
+++ b/lib/cli/agentutility.cpp
@@ -19,7 +19,6 @@
 
 #include "cli/agentutility.hpp"
 
-
 using namespace icinga;
 
 void AgentUtility::ListAgents(void)
diff --git a/lib/cli/agentwizardcommand.cpp b/lib/cli/agentwizardcommand.cpp
index 17db4a2db..8ec686f55 100644
--- a/lib/cli/agentwizardcommand.cpp
+++ b/lib/cli/agentwizardcommand.cpp
@@ -26,8 +26,6 @@
 #include <boost/algorithm/string/replace.hpp>
 #include <fstream>
 #include <vector>
-#include <string>
-#include <unistd.h>
 
 using namespace icinga;
 namespace po = boost::program_options;
diff --git a/lib/cli/featuredisablecommand.cpp b/lib/cli/featuredisablecommand.cpp
index 79473db23..17b06662b 100644
--- a/lib/cli/featuredisablecommand.cpp
+++ b/lib/cli/featuredisablecommand.cpp
@@ -26,8 +26,6 @@
 #include <boost/algorithm/string/join.hpp>
 #include <fstream>
 #include <vector>
-#include <string>
-#include <unistd.h>
 
 using namespace icinga;
 namespace po = boost::program_options;
diff --git a/lib/cli/featurelistcommand.cpp b/lib/cli/featurelistcommand.cpp
index a9aa9d685..8dd47b86f 100644
--- a/lib/cli/featurelistcommand.cpp
+++ b/lib/cli/featurelistcommand.cpp
@@ -27,7 +27,6 @@
 #include <fstream>
 #include <vector>
 #include <string>
-#include <unistd.h>
 
 using namespace icinga;
 namespace po = boost::program_options;