diff --git a/lib/cli/CMakeLists.txt b/lib/cli/CMakeLists.txt
index e1cc29afb..1e8a87573 100644
--- a/lib/cli/CMakeLists.txt
+++ b/lib/cli/CMakeLists.txt
@@ -37,6 +37,7 @@ target_link_libraries(cli ${Boost_LIBRARIES} base config remote icinga)
 set_target_properties (
   cli PROPERTIES
   INSTALL_RPATH ${CMAKE_INSTALL_FULL_LIBDIR}/icinga2
+  DEFINE_SYMBOL I2_CLI_BUILD
   FOLDER Lib
 )
 
diff --git a/lib/cli/agentblackandwhitelistcommand.hpp b/lib/cli/agentblackandwhitelistcommand.hpp
index 03ef8fdb4..e6a324898 100644
--- a/lib/cli/agentblackandwhitelistcommand.hpp
+++ b/lib/cli/agentblackandwhitelistcommand.hpp
@@ -37,7 +37,7 @@ enum BlackAndWhitelistCommandType
  *
  * @ingroup cli
  */
-class BlackAndWhitelistCommand : public CLICommand
+class I2_CLI_API BlackAndWhitelistCommand : public CLICommand
 {
 public:
 	DECLARE_PTR_TYPEDEFS(BlackAndWhitelistCommand);
@@ -60,7 +60,7 @@ private:
  *
  * @ingroup cli
  */
-class I2_BASE_API RegisterBlackAndWhitelistCLICommandHelper
+class I2_CLI_API RegisterBlackAndWhitelistCLICommandHelper
 {
 public:
 	RegisterBlackAndWhitelistCLICommandHelper(const String& type);
diff --git a/lib/cli/clicommand.hpp b/lib/cli/clicommand.hpp
index 39c3aa0cb..3d41fadcb 100644
--- a/lib/cli/clicommand.hpp
+++ b/lib/cli/clicommand.hpp
@@ -20,7 +20,7 @@
 #ifndef CLICOMMAND_H
 #define CLICOMMAND_H
 
-#include "base/i2-base.hpp"
+#include "cli/i2-cli.hpp"
 #include "base/value.hpp"
 #include "base/utility.hpp"
 #include <vector>
@@ -29,15 +29,15 @@
 namespace icinga
 {
 
-I2_BASE_API std::vector<String> GetBashCompletionSuggestions(const String& type, const String& word);
-I2_BASE_API std::vector<String> GetFieldCompletionSuggestions(const Type *type, const String& word);
+std::vector<String> I2_CLI_API GetBashCompletionSuggestions(const String& type, const String& word);
+std::vector<String> I2_CLI_API GetFieldCompletionSuggestions(const Type *type, const String& word);
 
 /**
  * A CLI command.
  *
  * @ingroup base
  */
-class I2_BASE_API CLICommand : public Object
+class I2_CLI_API CLICommand : public Object
 {
 public:
 	DECLARE_PTR_TYPEDEFS(CLICommand);
@@ -78,7 +78,7 @@ private:
  *
  * @ingroup base
  */
-class I2_BASE_API RegisterCLICommandHelper
+class I2_CLI_API RegisterCLICommandHelper
 {
 public:
 	RegisterCLICommandHelper(const String& name, const CLICommand::Ptr& command);
diff --git a/lib/cli/repositoryobjectcommand.hpp b/lib/cli/repositoryobjectcommand.hpp
index cb16c676a..0ecedf1dc 100644
--- a/lib/cli/repositoryobjectcommand.hpp
+++ b/lib/cli/repositoryobjectcommand.hpp
@@ -37,7 +37,7 @@ enum RepositoryCommandType
  *
  * @ingroup cli
  */
-class RepositoryObjectCommand : public CLICommand
+class I2_CLI_API RepositoryObjectCommand : public CLICommand
 {
 public:
 	DECLARE_PTR_TYPEDEFS(RepositoryObjectCommand);
@@ -61,7 +61,7 @@ private:
  *
  * @ingroup cli
  */
-class I2_BASE_API RegisterRepositoryCLICommandHelper
+class I2_CLI_API RegisterRepositoryCLICommandHelper
 {
 public:
 	RegisterRepositoryCLICommandHelper(const String& type);