diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1e83b8c0..0189e737 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -144,6 +144,12 @@ add_library(behavior_tree_editor SHARED
     ${APP_CPPS}
     ${FORMS_HEADERS}
 )
+set_target_properties(behavior_tree_editor PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS ON)
+include(GenerateExportHeader)
+generate_export_header(behavior_tree_editor)
+target_include_directories(behavior_tree_editor PUBLIC
+  $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>
+)
 
 SET(GROOT_DEPENDENCIES QtNodeEditor )
 
diff --git a/bt_editor/sidepanel_editor.h b/bt_editor/sidepanel_editor.h
index 8897d4bc..20dcb07a 100644
--- a/bt_editor/sidepanel_editor.h
+++ b/bt_editor/sidepanel_editor.h
@@ -7,11 +7,13 @@
 #include <QTableWidgetItem>
 #include "XML_utilities.hpp"
 
+#include "behavior_tree_editor_export.h"
+
 namespace Ui {
 class SidepanelEditor;
 }
 
-class SidepanelEditor : public QFrame
+class BEHAVIOR_TREE_EDITOR_EXPORT SidepanelEditor : public QFrame
 {
     Q_OBJECT
 
diff --git a/bt_editor/sidepanel_replay.h b/bt_editor/sidepanel_replay.h
index aa0de1bf..6512a195 100644
--- a/bt_editor/sidepanel_replay.h
+++ b/bt_editor/sidepanel_replay.h
@@ -7,12 +7,14 @@
 #include <QStandardItemModel>
 #include "bt_editor_base.h"
 
+#include "behavior_tree_editor_export.h"
+
 
 namespace Ui {
 class SidepanelReplay;
 }
 
-class SidepanelReplay : public QFrame
+class BEHAVIOR_TREE_EDITOR_EXPORT SidepanelReplay : public QFrame
 {
     Q_OBJECT
 
diff --git a/cmake/FindZMQ.cmake b/cmake/FindZMQ.cmake
index b0ae5dda..8f518607 100644
--- a/cmake/FindZMQ.cmake
+++ b/cmake/FindZMQ.cmake
@@ -13,6 +13,13 @@
 #  For details see the accompanying COPYING-CMAKE-SCRIPTS file.
 #
 
+find_package(ZeroMQ CONFIG REQUIRED)
+if(TARGET libzmq)
+  add_library(zmq ALIAS libzmq)
+  set(ZMQ_FOUND TRUE)
+  return()
+endif()
+
 if (ZMQ_LIBRARIES AND ZMQ_INCLUDE_DIRS)
   # in cache already
   set(ZMQ_FOUND TRUE)