11 files changed, 27 insertions, 21 deletions
diff --git a/ingen/client/ArcModel.hpp b/ingen/client/ArcModel.hpp
index 4306be09..d3635fd0 100644
--- a/ingen/client/ArcModel.hpp
+++ b/ingen/client/ArcModel.hpp
@@ -24,6 +24,7 @@
 
 #include "ingen/Arc.hpp"
 #include "ingen/client/PortModel.hpp"
+#include "ingen/ingen.h"
 
 namespace Ingen {
 namespace Client {
@@ -34,7 +35,7 @@ class ClientStore;
  *
  * @ingroup IngenClient
  */
-class ArcModel : public Arc
+class INGEN_API ArcModel : public Arc
 {
 public:
 	SPtr<PortModel> tail() const { return _tail; }
diff --git a/ingen/client/BlockModel.hpp b/ingen/client/BlockModel.hpp
index 2a1a6f5d..32c09c54 100644
--- a/ingen/client/BlockModel.hpp
+++ b/ingen/client/BlockModel.hpp
@@ -25,6 +25,7 @@
 #include "ingen/client/ObjectModel.hpp"
 #include "ingen/client/PluginModel.hpp"
 #include "ingen/client/PortModel.hpp"
+#include "ingen/ingen.h"
 #include "ingen/types.hpp"
 
 namespace Raul { class Path; }
@@ -42,7 +43,7 @@ class ClientStore;
  *
  * @ingroup IngenClient
  */
-class BlockModel : public ObjectModel
+class INGEN_API BlockModel : public ObjectModel
 {
 public:
 	BlockModel(const BlockModel& copy);
diff --git a/ingen/client/ClientStore.hpp b/ingen/client/ClientStore.hpp
index 1871fca2..3510fcb9 100644
--- a/ingen/client/ClientStore.hpp
+++ b/ingen/client/ClientStore.hpp
@@ -24,6 +24,7 @@
 #include "ingen/Interface.hpp"
 #include "ingen/Store.hpp"
 #include "ingen/client/signal.hpp"
+#include "ingen/ingen.h"
 #include "ingen/types.hpp"
 #include "raul/Path.hpp"
 
@@ -48,9 +49,9 @@ class SigClientInterface;
  *
  * @ingroup IngenClient
  */
-class ClientStore : public Store
-                  , public Interface
-                  , public INGEN_TRACKABLE {
+class INGEN_API ClientStore : public Store
+                            , public Interface
+                            , public INGEN_TRACKABLE {
 public:
 	ClientStore(
 		URIs&                    uris,
diff --git a/ingen/client/GraphModel.hpp b/ingen/client/GraphModel.hpp
index 2b166fd3..84fec681 100644
--- a/ingen/client/GraphModel.hpp
+++ b/ingen/client/GraphModel.hpp
@@ -18,6 +18,7 @@
 #define INGEN_CLIENT_GRAPHMODEL_HPP
 
 #include "ingen/client/BlockModel.hpp"
+#include "ingen/ingen.h"
 #include "ingen/types.hpp"
 
 namespace Ingen {
@@ -30,7 +31,7 @@ class ClientStore;
  *
  * @ingroup IngenClient
  */
-class GraphModel : public BlockModel
+class INGEN_API GraphModel : public BlockModel
 {
 public:
 	/* WARNING: Copy constructor creates a shallow copy WRT connections */
diff --git a/ingen/client/ObjectModel.hpp b/ingen/client/ObjectModel.hpp
index 6c582812..d5697493 100644
--- a/ingen/client/ObjectModel.hpp
+++ b/ingen/client/ObjectModel.hpp
@@ -32,6 +32,7 @@
 #include "ingen/Node.hpp"
 #include "ingen/Resource.hpp"
 #include "ingen/client/signal.hpp"
+#include "ingen/ingen.h"
 
 namespace Ingen {
 
@@ -52,7 +53,7 @@ class ClientStore;
  *
  * @ingroup IngenClient
  */
-class ObjectModel : public Node
+class INGEN_API ObjectModel : public Node
 {
 public:
 	virtual ~ObjectModel();
diff --git a/ingen/client/PluginModel.hpp b/ingen/client/PluginModel.hpp
index 79fae72d..767dbc70 100644
--- a/ingen/client/PluginModel.hpp
+++ b/ingen/client/PluginModel.hpp
@@ -26,6 +26,7 @@
 #include "ingen/Resource.hpp"
 #include "ingen/World.hpp"
 #include "ingen/client/signal.hpp"
+#include "ingen/ingen.h"
 #include "ingen/types.hpp"
 #include "lilv/lilv.h"
 #include "raul/Symbol.hpp"
@@ -45,7 +46,7 @@ class PluginUI;
  *
  * @ingroup IngenClient
  */
-class PluginModel : public Ingen::Plugin
+class INGEN_API PluginModel : public Ingen::Plugin
 {
 public:
 	PluginModel(URIs&                              uris,
diff --git a/ingen/client/PluginUI.hpp b/ingen/client/PluginUI.hpp
index 63e1074d..83a810f3 100644
--- a/ingen/client/PluginUI.hpp
+++ b/ingen/client/PluginUI.hpp
@@ -19,14 +19,12 @@
 
 #include <set>
 
+#include "ingen/LV2Features.hpp"
+#include "ingen/ingen.h"
 #include "ingen/types.hpp"
-
 #include "lilv/lilv.h"
-
 #include "suil/suil.h"
 
-#include "ingen/LV2Features.hpp"
-
 namespace Ingen {
 
 class Interface;
@@ -40,7 +38,7 @@ class BlockModel;
  *
  * @ingroup IngenClient
  */
-class PluginUI {
+class INGEN_API PluginUI {
 public:
 	~PluginUI();
 
diff --git a/ingen/client/PortModel.hpp b/ingen/client/PortModel.hpp
index 647aa922..5903e865 100644
--- a/ingen/client/PortModel.hpp
+++ b/ingen/client/PortModel.hpp
@@ -20,13 +20,12 @@
 #include <cstdlib>
 #include <string>
 
+#include "ingen/client/ObjectModel.hpp"
+#include "ingen/ingen.h"
 #include "ingen/types.hpp"
-
 #include "lv2/lv2plug.in/ns/ext/port-props/port-props.h"
 #include "lv2/lv2plug.in/ns/lv2core/lv2.h"
 
-#include "ingen/client/ObjectModel.hpp"
-
 namespace Raul { class Path; }
 
 namespace Ingen {
@@ -36,7 +35,7 @@ namespace Client {
  *
  * @ingroup IngenClient
  */
-class PortModel : public ObjectModel
+class INGEN_API PortModel : public ObjectModel
 {
 public:
 	enum class Direction { INPUT, OUTPUT };
diff --git a/ingen/client/SigClientInterface.hpp b/ingen/client/SigClientInterface.hpp
index 39fff895..35166a2e 100644
--- a/ingen/client/SigClientInterface.hpp
+++ b/ingen/client/SigClientInterface.hpp
@@ -25,6 +25,7 @@
 
 #include "ingen/Interface.hpp"
 #include "ingen/client/signal.hpp"
+#include "ingen/ingen.h"
 
 namespace Ingen {
 namespace Client {
@@ -39,8 +40,8 @@ namespace Client {
  *
  * @ingroup IngenClient
  */
-class SigClientInterface : public Ingen::Interface,
-                           public INGEN_TRACKABLE
+class INGEN_API SigClientInterface : public Ingen::Interface,
+                                     public INGEN_TRACKABLE
 {
 public:
 	SigClientInterface() {}
diff --git a/ingen/client/SocketClient.hpp b/ingen/client/SocketClient.hpp
index c8da1e80..e6ed6c6c 100644
--- a/ingen/client/SocketClient.hpp
+++ b/ingen/client/SocketClient.hpp
@@ -19,12 +19,13 @@
 
 #include "ingen/SocketReader.hpp"
 #include "ingen/SocketWriter.hpp"
+#include "ingen/ingen.h"
 
 namespace Ingen {
 namespace Client {
 
 /** The client side of an Ingen socket connection. */
-class SocketClient : public SocketWriter
+class INGEN_API SocketClient : public SocketWriter
 {
 public:
 	SocketClient(World&             world,
diff --git a/ingen/client/ThreadedSigClientInterface.hpp b/ingen/client/ThreadedSigClientInterface.hpp
index 0d5d5e57..a2e1c5da 100644
--- a/ingen/client/ThreadedSigClientInterface.hpp
+++ b/ingen/client/ThreadedSigClientInterface.hpp
@@ -28,6 +28,7 @@
 #include "ingen/Atom.hpp"
 #include "ingen/Interface.hpp"
 #include "ingen/client/SigClientInterface.hpp"
+#include "ingen/ingen.h"
 #include "raul/SRSWQueue.hpp"
 
 /** Returns nothing and takes no parameters (because they have all been bound) */
@@ -48,7 +49,7 @@ namespace Client {
  *
  * @ingroup IngenClient
  */
-class ThreadedSigClientInterface : public SigClientInterface
+class INGEN_API ThreadedSigClientInterface : public SigClientInterface
 {
 public:
 	explicit ThreadedSigClientInterface(uint32_t queue_size)