diff --git a/src/musikcore/debug.h b/src/musikcore/debug.h
index 55fbc944d..660bd622d 100755
--- a/src/musikcore/debug.h
+++ b/src/musikcore/debug.h
@@ -82,16 +82,16 @@ namespace musik {
                     EXPORT virtual void error(const std::string& tag, const std::string& string) override;
             };
 
-            static void Start(std::vector<IBackend*> backends = { new SimpleFileBackend() });
-            static void Shutdown();
+            static EXPORT void Start(std::vector<IBackend*> backends = { new SimpleFileBackend() });
+            static EXPORT void Shutdown();
 
-            static void verbose(const std::string& tag, const std::string& string) noexcept;
-            static void v(const std::string& tag, const std::string& string) noexcept;
-            static void info(const std::string& tag, const std::string& string) noexcept;
-            static void i(const std::string& tag, const std::string& string) noexcept;
-            static void warning(const std::string& tag, const std::string& string) noexcept;
-            static void w(const std::string& tag, const std::string& string) noexcept;
-            static void error(const std::string& tag, const std::string& string) noexcept;
-            static void e(const std::string& tag, const std::string& string) noexcept;
+            static EXPORT void verbose(const std::string& tag, const std::string& string) noexcept;
+            static EXPORT void v(const std::string& tag, const std::string& string) noexcept;
+            static EXPORT void info(const std::string& tag, const std::string& string) noexcept;
+            static EXPORT void i(const std::string& tag, const std::string& string) noexcept;
+            static EXPORT void warning(const std::string& tag, const std::string& string) noexcept;
+            static EXPORT void w(const std::string& tag, const std::string& string) noexcept;
+            static EXPORT void error(const std::string& tag, const std::string& string) noexcept;
+            static EXPORT void e(const std::string& tag, const std::string& string) noexcept;
     };
 }
diff --git a/src/musikcore/library/LibraryFactory.h b/src/musikcore/library/LibraryFactory.h
index eecfc8d5e..b467f1c40 100644
--- a/src/musikcore/library/LibraryFactory.h
+++ b/src/musikcore/library/LibraryFactory.h
@@ -55,9 +55,9 @@ namespace musik { namespace core {
 
             EXPORT ~LibraryFactory();
 
-            static void Initialize(IMessageQueue& messageQueue);
-            static LibraryFactory& Instance();
-            static void Shutdown();
+            static EXPORT void Initialize(IMessageQueue& messageQueue);
+            static EXPORT LibraryFactory& Instance();
+            static EXPORT void Shutdown();
 
             EXPORT ILibraryPtr DefaultLocalLibrary();
             EXPORT ILibraryPtr DefaultRemoteLibrary();
diff --git a/src/musikcore/net/PiggyWebSocketClient.h b/src/musikcore/net/PiggyWebSocketClient.h
index 53d03599d..eb61706c0 100644
--- a/src/musikcore/net/PiggyWebSocketClient.h
+++ b/src/musikcore/net/PiggyWebSocketClient.h
@@ -74,8 +74,8 @@ namespace musik { namespace core { namespace net {
 
             sigslot::signal3<PiggyWebSocketClient*, State, State> StateChanged;
 
-            static std::shared_ptr<PiggyWebSocketClient> Instance(MessageQueue* messageQueue);
-            static void Shutdown();
+            static EXPORT std::shared_ptr<PiggyWebSocketClient> Instance(MessageQueue* messageQueue);
+            static EXPORT void Shutdown();
 
             EXPORT PiggyWebSocketClient(const PiggyWebSocketClient&) = delete;
             EXPORT virtual ~PiggyWebSocketClient();
diff --git a/src/musikcore/plugin/PluginFactory.h b/src/musikcore/plugin/PluginFactory.h
index dd59b82c5..d8639febc 100644
--- a/src/musikcore/plugin/PluginFactory.h
+++ b/src/musikcore/plugin/PluginFactory.h
@@ -55,18 +55,18 @@ namespace musik { namespace core {
 
     class PluginFactory {
         public:
-            static PluginFactory& Instance();
+            static EXPORT PluginFactory& Instance();
 
             template <typename T>
             struct ReleaseDeleter {
-                EXPORT void operator()(T* t) {
+                void operator()(T* t) {
                     t->Release();
                 }
             };
 
             template <typename T>
             struct NullDeleter {
-                EXPORT void operator()(T* t) {
+                void operator()(T* t) {
                 }
             };
 
@@ -134,7 +134,7 @@ namespace musik { namespace core {
                 }
             }
 
-            std::shared_ptr<musik::core::sdk::IPlugin> QueryGuid(const std::string& guid) {
+            EXPORT std::shared_ptr<musik::core::sdk::IPlugin> QueryGuid(const std::string& guid) {
                 using T = musik::core::sdk::IPlugin;
                 std::shared_ptr<T> result;
                 using Deleter = PluginFactory::ReleaseDeleter<T>;
diff --git a/src/musikcore/runtime/Message.h b/src/musikcore/runtime/Message.h
index 1c8337f6d..d9b749ff7 100755
--- a/src/musikcore/runtime/Message.h
+++ b/src/musikcore/runtime/Message.h
@@ -47,7 +47,7 @@ namespace musik { namespace core { namespace runtime {
                 int64_t data2);
 
         public:
-            static IMessagePtr Create(
+            static EXPORT IMessagePtr Create(
                 IMessageTarget* target,
                 int messageType,
                 int64_t data1 = 0LL,