diff --git a/lib/base/clicommand.cpp b/lib/base/clicommand.cpp
index 0a5062d9b..d4c76988f 100644
--- a/lib/base/clicommand.cpp
+++ b/lib/base/clicommand.cpp
@@ -19,6 +19,8 @@
 
 #include "base/clicommand.hpp"
 #include "base/logger_fwd.hpp"
+#include "base/type.hpp"
+#include "base/serializer.hpp"
 #include <boost/algorithm/string/split.hpp>
 #include <boost/algorithm/string/join.hpp>
 #include <boost/algorithm/string/trim.hpp>
diff --git a/lib/cli/agentblackandwhitelistcommand.cpp b/lib/cli/agentblackandwhitelistcommand.cpp
index dcc2c54dc..02fbc1fc2 100644
--- a/lib/cli/agentblackandwhitelistcommand.cpp
+++ b/lib/cli/agentblackandwhitelistcommand.cpp
@@ -26,6 +26,7 @@
 #include <fstream>
 
 using namespace icinga;
+namespace po = boost::program_options;
 
 REGISTER_BLACKANDWHITELIST_CLICOMMAND("whitelist");
 REGISTER_BLACKANDWHITELIST_CLICOMMAND("blacklist");
diff --git a/lib/cli/agentutility.hpp b/lib/cli/agentutility.hpp
index 981e3020a..845e77541 100644
--- a/lib/cli/agentutility.hpp
+++ b/lib/cli/agentutility.hpp
@@ -17,29 +17,30 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#ifndef AGENTUTILITYCOMMAND_H
-#define AGENTUTILITYCOMMAND_H
+#ifndef AGENTUTILITY_H
+#define AGENTUTILITY_H
+
+#include "base/i2-base.hpp"
+#include "base/value.hpp"
 
 namespace icinga
 {
 
 /**
- * The "pki new-ca" command.
- *
  * @ingroup cli
  */
-class AgentUtility {
-
+class AgentUtility
+{
 public:
-	DECLARE_PTR_TYPEDEFS(AgentUtility);
-
-	void ListAgents(void);
-	bool AddAgent(const String& name);
-	bool RemoveAgent(const String& name);
-	bool SetAgentAttribute(const String& attr, const Value& val);
+	static void ListAgents(void);
+	static bool AddAgent(const String& name);
+	static bool RemoveAgent(const String& name);
+	static bool SetAgentAttribute(const String& attr, const Value& val);
 
+private:
+	AgentUtility(void);
 };
 
 }
 
-#endif /* AGENTUTILITYCOMMAND_H */
+#endif /* AGENTUTILITY_H */
diff --git a/lib/cli/repositoryobjectcommand.cpp b/lib/cli/repositoryobjectcommand.cpp
index 074ba82e7..d0e840722 100644
--- a/lib/cli/repositoryobjectcommand.cpp
+++ b/lib/cli/repositoryobjectcommand.cpp
@@ -26,6 +26,7 @@
 #include <fstream>
 
 using namespace icinga;
+namespace po = boost::program_options;
 
 REGISTER_REPOSITORY_CLICOMMAND("Host");
 REGISTER_REPOSITORY_CLICOMMAND("Service");