diff --git a/cpp/csp/core/BasicAllocator.h b/cpp/csp/core/BasicAllocator.h
index da3aac792..029518a7c 100644
--- a/cpp/csp/core/BasicAllocator.h
+++ b/cpp/csp/core/BasicAllocator.h
@@ -15,7 +15,7 @@ namespace csp
 {
 
 // Extremely basic non-thread safe fixed-size allocator
-class BasicAllocator
+class CSP_PUBLIC BasicAllocator
 {
 public:
     //elemsize is size of a single alloc, blockSize is number of elements to 
diff --git a/cpp/csp/core/DynamicBitSet.h b/cpp/csp/core/DynamicBitSet.h
index 5fb120f06..eb4a950fc 100644
--- a/cpp/csp/core/DynamicBitSet.h
+++ b/cpp/csp/core/DynamicBitSet.h
@@ -9,7 +9,7 @@ namespace csp
 {
 
 template<typename NodeT = uint64_t, typename IndexT = int32_t>
-class DynamicBitSet
+class CSP_PUBLIC DynamicBitSet
 {
 
 public:
diff --git a/cpp/csp/core/Enum.h b/cpp/csp/core/Enum.h
index aac11fd5d..428dadee2 100644
--- a/cpp/csp/core/Enum.h
+++ b/cpp/csp/core/Enum.h
@@ -73,7 +73,7 @@ bool UnknownOnInvalidValue(long) { return false; }
 
 START_PACKED
 template<typename EnumTraits>
-struct Enum : public EnumTraits
+struct CSP_PUBLIC Enum : public EnumTraits
 {
     using EnumV = typename EnumTraits::_enum;
     using Mapping = std::vector<std::string>;
diff --git a/cpp/csp/core/EnumBitSet.h b/cpp/csp/core/EnumBitSet.h
index 660681029..49c0fdac5 100644
--- a/cpp/csp/core/EnumBitSet.h
+++ b/cpp/csp/core/EnumBitSet.h
@@ -1,6 +1,8 @@
 #ifndef _IN_CSP_CORE_ENUMBITSET_H
 #define _IN_CSP_CORE_ENUMBITSET_H
 
+#include <csp/core/Platform.h>
+
 #include <stddef.h>
 #include <stdint.h>
 #include <initializer_list>
@@ -12,7 +14,7 @@ namespace csp
 //Utility class to hold enums as a bitmask ( where enum values are incremental from 0 )
 //enum must have a NUM_TYPES entry for number of entries
 template< typename EnumT >
-class EnumBitSet
+class CSP_PUBLIC EnumBitSet
 {
     using value_type = uint64_t;
 
diff --git a/cpp/csp/core/Generator.h b/cpp/csp/core/Generator.h
index 8f33eaddf..fabd1e8ec 100644
--- a/cpp/csp/core/Generator.h
+++ b/cpp/csp/core/Generator.h
@@ -1,12 +1,13 @@
 #ifndef _IN_CSP_CORE_GENERATOR_H
 #define _IN_CSP_CORE_GENERATOR_H
 
+#include <csp/core/Platform.h>
 #include <memory>
 
 namespace csp
 {
 template< typename V, typename ...Args >
-class Generator
+class CSP_PUBLIC Generator
 {
 public:
     using Ptr = std::shared_ptr<Generator<V, Args...>>;
diff --git a/cpp/csp/core/QueueWaiter.h b/cpp/csp/core/QueueWaiter.h
index 307930cd5..d8d40bb81 100644
--- a/cpp/csp/core/QueueWaiter.h
+++ b/cpp/csp/core/QueueWaiter.h
@@ -1,17 +1,20 @@
 #ifndef _IN_CSP_CORE_QUEUEBLOCKINGWAIT_H
 #define _IN_CSP_CORE_QUEUEBLOCKINGWAIT_H
 
+#include <csp/core/Platform.h>
+#include <csp/core/System.h>
+#include <csp/core/Time.h>
+
 #include <mutex>
 #include <condition_variable>
-#include <csp/core/Time.h>
-#include <csp/core/System.h>
+
 
 namespace csp
 {
 
 class TimeDelta;
 
-class QueueWaiter
+class CSP_PUBLIC QueueWaiter
 {
 public:
     QueueWaiter() : m_eventsPending( false )
diff --git a/cpp/csp/core/SRMWLockFreeQueue.h b/cpp/csp/core/SRMWLockFreeQueue.h
index 902c8a364..23a05592b 100644
--- a/cpp/csp/core/SRMWLockFreeQueue.h
+++ b/cpp/csp/core/SRMWLockFreeQueue.h
@@ -1,6 +1,7 @@
 #ifndef _IN_CSP_CORE_SRMWLOCKFREEQUEUE_H
 #define _IN_CSP_CORE_SRMWLOCKFREEQUEUE_H
 
+#include <csp/core/Platform.h>
 #include <csp/core/QueueWaiter.h>
 #include <csp/core/System.h>
 #include <csp/core/Time.h>
@@ -14,7 +15,7 @@ namespace csp
   one of the simplest!  template type is required to have an intrinsic next pointer
 */
 template< typename T >
-class alignas(CACHELINE_SIZE) SRMWLockFreeQueue
+class alignas(CACHELINE_SIZE) CSP_PUBLIC SRMWLockFreeQueue
 {
 public:
     class Batch
diff --git a/cpp/csp/core/TaggedPointerUnion.h b/cpp/csp/core/TaggedPointerUnion.h
index 43a41a85f..358bc1744 100644
--- a/cpp/csp/core/TaggedPointerUnion.h
+++ b/cpp/csp/core/TaggedPointerUnion.h
@@ -1,6 +1,7 @@
 #ifndef _IN_CSP_CORE_TAGGEDPOINTERUNION_H
 #define _IN_CSP_CORE_TAGGEDPOINTERUNION_H
 
+#include <csp/core/Platform.h>
 #include <csp/core/System.h>
 
 namespace csp
@@ -25,7 +26,7 @@ struct IndexOf<T, TypeList<TOther, Ts...> >
 
 
 template<typename... Ts>
-class TaggedPointerUnion
+class CSP_PUBLIC TaggedPointerUnion
 {
 public:
     static inline constexpr size_t NUM_TAGS = sizeof...(Ts);
diff --git a/cpp/csp/core/Time.h b/cpp/csp/core/Time.h
index f2e73d990..70e8d2f70 100644
--- a/cpp/csp/core/Time.h
+++ b/cpp/csp/core/Time.h
@@ -21,7 +21,7 @@ const int64_t NANOS_PER_SECOND      = 1000000000;
 const int64_t SECONDS_PER_DAY       = 86400;
 const int64_t NANOS_PER_DAY         = NANOS_PER_SECOND * SECONDS_PER_DAY;
 
-class TimeDelta
+class CSP_PUBLIC TimeDelta
 {
 public:
     constexpr TimeDelta() : TimeDelta( TimeDelta::NONE() ) {}
@@ -165,7 +165,7 @@ inline std::ostream & operator <<( std::ostream &os, const TimeDelta & d )
     return os;
 }
 
-class Date
+class CSP_PUBLIC Date
 {
 public:
     Date() : Date( NONE() ) {}
@@ -316,7 +316,7 @@ inline std::ostream & operator <<( std::ostream &os, const Date & d )
     return os;
 }
 
-class Time
+class CSP_PUBLIC Time
 {
 public:
     Time() : Time( -1 ) {} //NONE
@@ -446,7 +446,7 @@ inline std::ostream & operator <<( std::ostream &os, const Time & t )
 
 // Time is internally stored as an int64_t nanoseconds since 1970. 
 // All DateTime objects are stored as UTC and should be treated as such
-class DateTime
+class CSP_PUBLIC DateTime
 {
 public:
     DateTime() : DateTime( DateTime::NONE() ) {}
@@ -597,7 +597,7 @@ inline std::ostream & operator <<( std::ostream &os, const DateTime & dt )
 //Helper class to extract day/month/year/etc info from raw timestamp
 //ie DateTimeEx dte( existingDt )
 //dte.day, etc etc
-class DateTimeEx : public DateTime
+class CSP_PUBLIC DateTimeEx : public DateTime
 {
 public:
     DateTimeEx( const DateTime & dt );
diff --git a/cpp/csp/engine/AdapterManager.h b/cpp/csp/engine/AdapterManager.h
index fd71126c9..52e243965 100644
--- a/cpp/csp/engine/AdapterManager.h
+++ b/cpp/csp/engine/AdapterManager.h
@@ -1,6 +1,7 @@
 #ifndef _IN_CSP_ADAPTER_MANAGER_H
 #define _IN_CSP_ADAPTER_MANAGER_H
 
+#include <csp/core/Platform.h>
 #include <csp/core/Time.h>
 #include <csp/engine/InputAdapter.h>
 #include <csp/engine/PushInputAdapter.h>
@@ -16,7 +17,7 @@ class AdapterManager;
 
 class Engine;
 
-class ManagedSimInputAdapter : public InputAdapter
+class CSP_PUBLIC ManagedSimInputAdapter : public InputAdapter
 {
 public:
     ManagedSimInputAdapter( csp::Engine *engine, const CspTypePtr &type, AdapterManager *manager, PushMode pushMode );
diff --git a/cpp/csp/engine/AlarmInputAdapter.h b/cpp/csp/engine/AlarmInputAdapter.h
index 28b70f704..f0428bac9 100644
--- a/cpp/csp/engine/AlarmInputAdapter.h
+++ b/cpp/csp/engine/AlarmInputAdapter.h
@@ -1,6 +1,7 @@
 #ifndef _IN_CSP_ENGINE_ALARMINPUTADAPTER_H
 #define _IN_CSP_ENGINE_ALARMINPUTADAPTER_H
 
+#include <csp/core/Platform.h>
 #include <csp/engine/InputAdapter.h>
 #include <unordered_set>
 
@@ -8,7 +9,7 @@ namespace csp
 {
 
 template<typename T>
-class AlarmInputAdapter final : public InputAdapter
+class CSP_PUBLIC AlarmInputAdapter final : public InputAdapter
 {
 public:
     AlarmInputAdapter( Engine * engine, CspTypePtr & type ) : InputAdapter( engine, type, PushMode::NON_COLLAPSING )
diff --git a/cpp/csp/engine/BasketInfo.h b/cpp/csp/engine/BasketInfo.h
index 4fa50cb8a..cd4da8a0b 100644
--- a/cpp/csp/engine/BasketInfo.h
+++ b/cpp/csp/engine/BasketInfo.h
@@ -2,6 +2,7 @@
 #define _IN_CSP_ENGINE_BASKETINFO_H
 
 #include <csp/core/Exception.h>
+#include <csp/core/Platform.h>
 #include <csp/engine/InputId.h>
 #include <csp/engine/RootEngine.h>
 #include <csp/engine/TimeSeriesProvider.h>
@@ -12,7 +13,7 @@ namespace csp
 
 class Node;
 
-class InputBasketInfo
+class CSP_PUBLIC InputBasketInfo
 {
     using TickedInputs = std::vector<INOUT_ELEMID_TYPE>;
 
@@ -188,7 +189,7 @@ class InputBasketInfo
     bool                        m_isDynamic;
 };
 
-class DynamicInputBasketInfo : public InputBasketInfo
+class CSP_PUBLIC DynamicInputBasketInfo : public InputBasketInfo
 {
 public:
     using ChangeCallback = std::function<void(const DialectGenericType & key,bool added, int64_t elemId, int64_t replaceId )>;
@@ -227,7 +228,7 @@ class DynamicInputBasketInfo : public InputBasketInfo
     TimeDelta         m_timeWindowPolicy;
 };
 
-class OutputBasketInfo
+class CSP_PUBLIC OutputBasketInfo
 {
 public:
     OutputBasketInfo( CspTypePtr & type, Node * node, size_t size, bool isDynamic = false );
@@ -254,7 +255,7 @@ class OutputBasketInfo
     bool                   m_isDynamic;
 };
 
-class DynamicOutputBasketInfo : public OutputBasketInfo
+class CSP_PUBLIC DynamicOutputBasketInfo : public OutputBasketInfo
 {
 public:
     DynamicOutputBasketInfo( CspTypePtr & type, Node * node );
diff --git a/cpp/csp/engine/Consumer.h b/cpp/csp/engine/Consumer.h
index f9d2bc7c6..22bcc077d 100644
--- a/cpp/csp/engine/Consumer.h
+++ b/cpp/csp/engine/Consumer.h
@@ -1,6 +1,7 @@
 #ifndef _IN_CSP_ENGINE_CONSUMER_H
 #define _IN_CSP_ENGINE_CONSUMER_H
 
+#include <csp/core/Platform.h>
 #include <csp/core/TaggedPointerUnion.h>
 #include <csp/engine/BasketInfo.h>
 #include <csp/engine/InputId.h>
@@ -13,7 +14,7 @@ namespace csp
 class InputAdapter;
 
 //Base of either regular Nodes or output adapters
-class Consumer
+class CSP_PUBLIC Consumer
 {
 public:
     Consumer( Engine * );
diff --git a/cpp/csp/engine/CppNode.h b/cpp/csp/engine/CppNode.h
index f4d33f58e..22a7a0a0c 100644
--- a/cpp/csp/engine/CppNode.h
+++ b/cpp/csp/engine/CppNode.h
@@ -13,7 +13,7 @@ namespace csp
 
 //CppNode is used specifically for C++ defined Nodes, and should only be used
 //for definig c++ nodes using the macros defined at the end
-class CppNode : public csp::Node
+class CSP_PUBLIC CppNode : public csp::Node
 {
 public:
     using Shape = std::variant<std::uint64_t,std::vector<std::string>>;
diff --git a/cpp/csp/engine/CspEnum.h b/cpp/csp/engine/CspEnum.h
index 93f083369..05e236c7f 100644
--- a/cpp/csp/engine/CspEnum.h
+++ b/cpp/csp/engine/CspEnum.h
@@ -3,6 +3,7 @@
 
 #include <csp/core/Exception.h>
 #include <csp/core/Hash.h>
+#include <csp/core/Platform.h>
 #include <limits>
 #include <string>
 #include <vector>
@@ -14,7 +15,7 @@ namespace csp
 
 class CspEnumMeta;
 
-class CspEnumInstance
+class CSP_PUBLIC CspEnumInstance
 {
 public:
     CspEnumInstance( std::string name, int64_t value, csp::CspEnumMeta * meta ) : m_name( name ), m_value( value ), m_meta( meta ) {}
@@ -34,7 +35,7 @@ class CspEnumInstance
 
 //As an optimization we do NOT attach meta or value to every instance of an enum.  Instead, the enum
 //holds only a pointer to a singleton CspEnumInstance, which holds the value, name, and meta pointer.
-class CspEnum
+class CSP_PUBLIC CspEnum
 {
 public:
     CspEnum();
@@ -58,7 +59,7 @@ class CspEnum
 
 std::ostream &operator<<( std::ostream &os, const CspEnum & rhs );
 
-class CspEnumMeta
+class CSP_PUBLIC CspEnumMeta
 {
 public:
     using ValueDef = std::unordered_map<std::string,int64_t>;
diff --git a/cpp/csp/engine/CspType.h b/cpp/csp/engine/CspType.h
index b85ab4148..c3c070bbf 100644
--- a/cpp/csp/engine/CspType.h
+++ b/cpp/csp/engine/CspType.h
@@ -2,6 +2,7 @@
 #define _IN_CSP_ENGINE_CSPTYPE_H
 
 #include <csp/core/Enum.h>
+#include <csp/core/Platform.h>
 #include <csp/core/Time.h>
 #include <csp/engine/CspEnum.h>
 #include <csp/engine/DialectGenericType.h>
@@ -14,7 +15,7 @@ namespace csp
 
 class CspStringType;
 
-class CspType
+class CSP_PUBLIC CspType
 {
 public:
 
@@ -115,7 +116,7 @@ class CspType
     Type m_type;
 };
 
-class CspStringType : public CspType
+class CSP_PUBLIC CspStringType : public CspType
 {
 public:
     CspStringType(bool isBytes)
@@ -134,7 +135,7 @@ class CspEnum;
 
 class CspEnumMeta;
 
-class CspEnumType : public CspType
+class CSP_PUBLIC CspEnumType : public CspType
 {
 public:
     CspEnumType( std::shared_ptr<CspEnumMeta> & meta ) : CspType( CspType::Type::ENUM ),
@@ -154,7 +155,7 @@ using StructPtr = TypedStructPtr<Struct>;
 
 class StructMeta;
 
-class CspStructType : public CspType
+class CSP_PUBLIC CspStructType : public CspType
 {
 public:
     CspStructType( const std::shared_ptr<StructMeta> & meta ) : CspType( CspType::Type::STRUCT ),
@@ -167,7 +168,7 @@ class CspStructType : public CspType
     std::shared_ptr<StructMeta> m_meta;
 };
 
-class CspArrayType : public CspType
+class CSP_PUBLIC CspArrayType : public CspType
 {
 public:
     CspArrayType( CspTypePtr elemType, bool isPyStructFastList = false ) :
diff --git a/cpp/csp/engine/CycleStepTable.h b/cpp/csp/engine/CycleStepTable.h
index 8605a7c2e..435377646 100644
--- a/cpp/csp/engine/CycleStepTable.h
+++ b/cpp/csp/engine/CycleStepTable.h
@@ -2,6 +2,7 @@
 #define _IN_CSP_ENGINE_CYCLESTEPTABLE_H
 
 #include <csp/core/DynamicBitSet.h>
+#include <csp/core/Platform.h>
 #include <stdint.h>
 #include <vector>
 
@@ -11,7 +12,7 @@ namespace csp
 class Consumer;
 class Profiler;
     
-class CycleStepTable
+class CSP_PUBLIC CycleStepTable
 {
 public:
     CycleStepTable();
diff --git a/cpp/csp/engine/Dictionary.h b/cpp/csp/engine/Dictionary.h
index 1e7a2c82a..faf6193f6 100644
--- a/cpp/csp/engine/Dictionary.h
+++ b/cpp/csp/engine/Dictionary.h
@@ -2,6 +2,7 @@
 #define _IN_CSP_CORE_DICTIONARY_H
 
 #include <csp/core/Exception.h>
+#include <csp/core/Platform.h>
 #include <csp/core/System.h>
 #include <csp/core/Time.h>
 #include <csp/engine/DialectGenericType.h>
@@ -22,7 +23,7 @@ using DictionaryPtr = std::shared_ptr<Dictionary>;
 class StructMeta;
 using StructMetaPtr = std::shared_ptr<StructMeta>;
 
-class Dictionary
+class CSP_PUBLIC Dictionary
 {
 public:
     struct Data;
diff --git a/cpp/csp/engine/DynamicEngine.h b/cpp/csp/engine/DynamicEngine.h
index e45392c6d..aa2b4130b 100644
--- a/cpp/csp/engine/DynamicEngine.h
+++ b/cpp/csp/engine/DynamicEngine.h
@@ -1,6 +1,7 @@
 #ifndef _IN_CSP_ENGINE_DYNAMICENGINE_H
 #define _IN_CSP_ENGINE_DYNAMICENGINE_H
 
+#include <csp/core/Platform.h>
 #include <csp/engine/Engine.h>
 #include <csp/engine/OutputAdapter.h>
 #include <string>
@@ -9,7 +10,7 @@
 namespace csp
 {
 
-class DynamicEngine final : public Engine
+class CSP_PUBLIC DynamicEngine final : public Engine
 {
 public:
     using ShutdownFn = std::function<void()>;
diff --git a/cpp/csp/engine/DynamicNode.h b/cpp/csp/engine/DynamicNode.h
index 3ad3711a6..6434cf26c 100644
--- a/cpp/csp/engine/DynamicNode.h
+++ b/cpp/csp/engine/DynamicNode.h
@@ -1,6 +1,7 @@
 #ifndef _IN_CSP_ENGINE_DYNAMIC_H
 #define _IN_CSP_ENGINE_DYNAMIC_H
 
+#include <csp/core/Platform.h>
 #include <csp/engine/CspType.h>
 #include <csp/engine/CycleStepTable.h>
 #include <csp/engine/Node.h>
@@ -17,7 +18,7 @@ class DynamicEngine;
 //external inputs and triggering a cycle step.  
 //All dynamic engine input adapters as well as all external timeseries wired into dynamic are registered as inputs
 //into the DynanicNode instance so that it can invoke cycle step at the appropriate times.
-class DynamicNode final : public Node
+class CSP_PUBLIC DynamicNode final : public Node
 {
 public:
     using Outputs = std::vector<const TimeSeriesProvider *>;
diff --git a/cpp/csp/engine/Engine.h b/cpp/csp/engine/Engine.h
index ed8799625..23afb256a 100644
--- a/cpp/csp/engine/Engine.h
+++ b/cpp/csp/engine/Engine.h
@@ -2,6 +2,7 @@
 #define _IN_CSP_ENGINE_ENGINE_H
 
 #include <csp/core/Exception.h>
+#include <csp/core/Platform.h>
 #include <csp/core/Time.h>
 #include <csp/engine/CycleStepTable.h>
 #include <csp/engine/DialectGenericType.h>
@@ -23,7 +24,7 @@ class TimeSeriesProvider;
 class Engine;
 class RootEngine;
 
-struct EngineOwned
+struct CSP_PUBLIC EngineOwned
 {
     //force objects derived from EngineOwned to go through engine createOwnedObject methods
     //little trick here to force all derivations to fail
@@ -34,7 +35,7 @@ struct EngineOwned
     void operator delete( void* ptr )            { ::operator delete(ptr); }
 };
 
-class Engine
+class CSP_PUBLIC Engine
 {
     using AdapterManagers   = std::vector<std::shared_ptr<AdapterManager>>;
     using InputAdapters     = std::vector<std::unique_ptr<InputAdapter>>;
diff --git a/cpp/csp/engine/Enums.h b/cpp/csp/engine/Enums.h
index 9581ba0e0..0a45bb28d 100644
--- a/cpp/csp/engine/Enums.h
+++ b/cpp/csp/engine/Enums.h
@@ -2,12 +2,13 @@
 #define _IN_CSP_ENGINE_ENUMS_H
 
 #include <csp/core/Enum.h>
+#include <csp/core/Platform.h>
 
 namespace csp
 {
 
 // NOTE this must align with the python side Enum definition ///
-struct PushModeTraits
+struct CSP_PUBLIC PushModeTraits
 {
     enum _enum : unsigned char
     {
diff --git a/cpp/csp/engine/EventPropagator.h b/cpp/csp/engine/EventPropagator.h
index 3627d6b5f..77e45ca4c 100644
--- a/cpp/csp/engine/EventPropagator.h
+++ b/cpp/csp/engine/EventPropagator.h
@@ -1,6 +1,7 @@
 #ifndef _IN_CSP_ENGINE_EVENTPROPAGATOR_H
 #define _IN_CSP_ENGINE_EVENTPROPAGATOR_H
 
+#include <csp/core/Platform.h>
 #include <csp/engine/InputId.h>
 #include <stdint.h>
 
@@ -9,7 +10,7 @@ namespace csp
 
 class Consumer;
 
-class EventPropagator
+class CSP_PUBLIC EventPropagator
 {
 public:
     EventPropagator();
diff --git a/cpp/csp/engine/Feedback.h b/cpp/csp/engine/Feedback.h
index ae02925aa..c8a128a5b 100644
--- a/cpp/csp/engine/Feedback.h
+++ b/cpp/csp/engine/Feedback.h
@@ -1,6 +1,7 @@
 #ifndef _IN_CSP_ENGINE_FEEDBACK_H
 #define _IN_CSP_ENGINE_FEEDBACK_H
 
+#include <csp/core/Platform.h>
 #include <csp/engine/InputAdapter.h>
 #include <csp/engine/OutputAdapter.h>
 
@@ -11,7 +12,7 @@ template<typename T>
 class FeedbackInputAdapter;
 
 template<typename T>
-class FeedbackOutputAdapter final : public OutputAdapter
+class CSP_PUBLIC FeedbackOutputAdapter final : public OutputAdapter
 {
 public:
     FeedbackOutputAdapter( csp::Engine * engine, 
diff --git a/cpp/csp/engine/GraphOutputAdapter.h b/cpp/csp/engine/GraphOutputAdapter.h
index c160f9d1a..14e869361 100644
--- a/cpp/csp/engine/GraphOutputAdapter.h
+++ b/cpp/csp/engine/GraphOutputAdapter.h
@@ -1,6 +1,7 @@
 #ifndef _IN_CSP_ENGINE_GRAPHOUTPUTADAPTER_H
 #define _IN_CSP_ENGINE_GRAPHOUTPUTADAPTER_H
 
+#include <csp/core/Platform.h>
 #include <csp/engine/OutputAdapter.h>
 #include <memory>
 
@@ -14,7 +15,7 @@ namespace csp
 //GraphOutputAdapters are also special in that they are registered in both a dynamic engine and the root engine as sahred_ptr.  They make it into root
 //so that the root processes them at the end of the csp.run call ( dynamics could be shutdown by then ).  We also register in root
 //to ensure we dont hit key clashses.
-class GraphOutputAdapter : public OutputAdapter, public std::enable_shared_from_this<GraphOutputAdapter>
+class CSP_PUBLIC GraphOutputAdapter : public OutputAdapter, public std::enable_shared_from_this<GraphOutputAdapter>
 {
 public:
     GraphOutputAdapter( csp::Engine * engine, int32_t tickCount, TimeDelta tickHistory );
diff --git a/cpp/csp/engine/InputAdapter.h b/cpp/csp/engine/InputAdapter.h
index f992d6ff2..462000f2c 100644
--- a/cpp/csp/engine/InputAdapter.h
+++ b/cpp/csp/engine/InputAdapter.h
@@ -1,6 +1,7 @@
 #ifndef _IN_CSP_ENGINE_INPUTADAPTER_H
 #define _IN_CSP_ENGINE_INPUTADAPTER_H
 
+#include <csp/core/Platform.h>
 #include <csp/core/Time.h>
 #include <csp/engine/Enums.h>
 #include <csp/engine/RootEngine.h>
@@ -11,7 +12,7 @@ namespace csp
 
 class Consumer;
 
-class InputAdapter : public TimeSeriesProvider, public EngineOwned
+class CSP_PUBLIC InputAdapter : public TimeSeriesProvider, public EngineOwned
 {
 public:
     InputAdapter( Engine * engine, const CspTypePtr & type, PushMode pushMode );
diff --git a/cpp/csp/engine/Node.h b/cpp/csp/engine/Node.h
index 23ab37a4d..73bbaadb3 100644
--- a/cpp/csp/engine/Node.h
+++ b/cpp/csp/engine/Node.h
@@ -2,6 +2,7 @@
 #define _IN_CSP_ENGINE_NODE_H
 
 #include <csp/core/Exception.h>
+#include <csp/core/Platform.h>
 #include <csp/engine/AlarmInputAdapter.h>
 #include <csp/engine/BasketInfo.h>
 #include <csp/engine/Consumer.h>
@@ -24,7 +25,7 @@ struct NodeDef
     INOUT_ID_TYPE numOutputs;
 };
     
-class Node : public Consumer, public EngineOwned
+class CSP_PUBLIC Node : public Consumer, public EngineOwned
 {
 public:
     Node( NodeDef def, Engine * );
diff --git a/cpp/csp/engine/OutputAdapter.h b/cpp/csp/engine/OutputAdapter.h
index 7a3f1040d..53c993f1d 100644
--- a/cpp/csp/engine/OutputAdapter.h
+++ b/cpp/csp/engine/OutputAdapter.h
@@ -1,6 +1,7 @@
 #ifndef _IN_CSP_ENGINE_OUTPUTADAPTER_H
 #define _IN_CSP_ENGINE_OUTPUTADAPTER_H
 
+#include <csp/core/Platform.h>
 #include <csp/engine/Consumer.h>
 #include <csp/engine/Engine.h>
 
@@ -9,7 +10,7 @@ namespace csp
 
 class TimeSeriesProvider;
 
-class OutputAdapter : public Consumer, public EngineOwned
+class CSP_PUBLIC OutputAdapter : public Consumer, public EngineOwned
 {
 public:
     OutputAdapter( csp::Engine * engine );
diff --git a/cpp/csp/engine/PendingPushEvents.h b/cpp/csp/engine/PendingPushEvents.h
index 5036e7fd2..95b43e43b 100644
--- a/cpp/csp/engine/PendingPushEvents.h
+++ b/cpp/csp/engine/PendingPushEvents.h
@@ -1,6 +1,7 @@
 #ifndef _IN_CSP_ENGINE_PENDINGPUSHEVENTS_H
 #define _IN_CSP_ENGINE_PENDINGPUSHEVENTS_H
 
+#include <csp/core/Platform.h>
 #include <csp/engine/PushEvent.h>
 #include <unordered_map>
 
@@ -10,7 +11,7 @@ namespace csp
 struct PushGroup;
 class PushInputAdapters;
 
-class PendingPushEvents
+class CSP_PUBLIC PendingPushEvents
 {
 public:
     PendingPushEvents();
diff --git a/cpp/csp/engine/Profiler.h b/cpp/csp/engine/Profiler.h
index 6fb5dfee8..71044aba8 100644
--- a/cpp/csp/engine/Profiler.h
+++ b/cpp/csp/engine/Profiler.h
@@ -13,7 +13,7 @@
 namespace csp
 {
 
-class Profiler
+class CSP_PUBLIC Profiler
 {
     // All times are returned as doubles representing time in seconds
 
diff --git a/cpp/csp/engine/PullInputAdapter.h b/cpp/csp/engine/PullInputAdapter.h
index 5da071e23..455e21aa0 100644
--- a/cpp/csp/engine/PullInputAdapter.h
+++ b/cpp/csp/engine/PullInputAdapter.h
@@ -1,6 +1,7 @@
 #ifndef _IN_CSP_ENGINE_PULLINPUTADAPTER_H
 #define _IN_CSP_ENGINE_PULLINPUTADAPTER_H
 
+#include <csp/core/Platform.h>
 #include <csp/core/Time.h>
 #include <csp/engine/Engine.h>
 #include <csp/engine/InputAdapter.h>
@@ -9,7 +10,7 @@ namespace csp
 {
 
 template<typename T>
-class PullInputAdapter : public InputAdapter
+class CSP_PUBLIC PullInputAdapter : public InputAdapter
 {
 public:
     PullInputAdapter( Engine * engine, CspTypePtr & type, PushMode pushMode ) : InputAdapter( engine, type, pushMode ) 
diff --git a/cpp/csp/engine/PushEvent.h b/cpp/csp/engine/PushEvent.h
index bc16c024d..6e75ce7e0 100644
--- a/cpp/csp/engine/PushEvent.h
+++ b/cpp/csp/engine/PushEvent.h
@@ -1,6 +1,7 @@
 #ifndef _IN_CSP_ENGINE_PUSHEVENT_H
 #define _IN_CSP_ENGINE_PUSHEVENT_H
 
+#include <csp/core/Platform.h>
 #include <csp/engine/CspType.h>
 
 namespace csp
@@ -8,7 +9,7 @@ namespace csp
 
 class PushInputAdapter;
 
-struct PushEvent
+struct CSP_PUBLIC PushEvent
 {
     PushEvent( PushInputAdapter *adapter ) : m_adapter( adapter ), next( nullptr )
     {}
diff --git a/cpp/csp/engine/PushInputAdapter.h b/cpp/csp/engine/PushInputAdapter.h
index 665962a7a..d17233a19 100644
--- a/cpp/csp/engine/PushInputAdapter.h
+++ b/cpp/csp/engine/PushInputAdapter.h
@@ -1,6 +1,7 @@
 #ifndef _IN_CSP_ENGINE_PUSHINPUTADAPTER_H
 #define _IN_CSP_ENGINE_PUSHINPUTADAPTER_H
 
+#include <csp/core/Platform.h>
 #include <csp/core/Time.h>
 #include <csp/engine/CspType.h>
 #include <csp/engine/InputAdapter.h>
@@ -75,7 +76,7 @@ class PushBatch : public SRMWLockFreeQueue<PushEvent>::Batch
     PushGroup * m_group; //used for assertion check
 };
 
-class PushInputAdapter : public InputAdapter
+class CSP_PUBLIC PushInputAdapter : public InputAdapter
 {
 public:
     PushInputAdapter( Engine * engine, CspTypePtr & type, PushMode pushMode,
diff --git a/cpp/csp/engine/PushPullInputAdapter.h b/cpp/csp/engine/PushPullInputAdapter.h
index 2cd46bee7..2f08da998 100644
--- a/cpp/csp/engine/PushPullInputAdapter.h
+++ b/cpp/csp/engine/PushPullInputAdapter.h
@@ -1,6 +1,7 @@
 #ifndef _IN_CSP_ENGINE_PUSHPULLINPUTADAPTER_H
 #define _IN_CSP_ENGINE_PUSHPULLINPUTADAPTER_H
 
+#include <csp/core/Platform.h>
 #include <csp/engine/PushInputAdapter.h>
 #include <queue>
 
@@ -9,7 +10,7 @@ namespace csp
 //A variation of PushInputAdapter that lets you schedule historical data as well.  Used for adapters
 //that can replay history and switch to realtime seamlessly ( ie kafka )
 
-class PushPullInputAdapter : public PushInputAdapter
+class CSP_PUBLIC PushPullInputAdapter : public PushInputAdapter
 {
 public:
     PushPullInputAdapter( Engine * engine, CspTypePtr & type, PushMode pushMode,
diff --git a/cpp/csp/engine/RootEngine.h b/cpp/csp/engine/RootEngine.h
index 746704580..d8c10be7b 100644
--- a/cpp/csp/engine/RootEngine.h
+++ b/cpp/csp/engine/RootEngine.h
@@ -2,6 +2,7 @@
 #define _IN_CSP_ENGINE_ROOTENGINE_H
 
 #include <csp/core/Exception.h>
+#include <csp/core/Platform.h>
 #include <csp/core/SRMWLockFreeQueue.h>
 #include <csp/core/System.h>
 #include <csp/core/Time.h>
@@ -33,7 +34,7 @@ class EndCycleListener
     bool m_dirty = false;
 };
 
-class RootEngine : public Engine
+class CSP_PUBLIC RootEngine : public Engine
 {
     using PushEventQueue  = SRMWLockFreeQueue<PushEvent>;
 
diff --git a/cpp/csp/engine/Scheduler.h b/cpp/csp/engine/Scheduler.h
index 96efc2c58..438c489a6 100644
--- a/cpp/csp/engine/Scheduler.h
+++ b/cpp/csp/engine/Scheduler.h
@@ -2,6 +2,7 @@
 #define _IN_CSP_ENGINE_SCHEDULER_H
 
 #include <csp/core/BasicAllocator.h>
+#include <csp/core/Platform.h>
 #include <csp/core/Time.h>
 #include <cassert>
 #include <functional>
@@ -14,7 +15,7 @@ namespace csp
 
 class InputAdapter;
 
-class Scheduler
+class CSP_PUBLIC Scheduler
 {
     struct Event;
 
diff --git a/cpp/csp/engine/StatusAdapter.h b/cpp/csp/engine/StatusAdapter.h
index f243c7c70..aebacc3f6 100644
--- a/cpp/csp/engine/StatusAdapter.h
+++ b/cpp/csp/engine/StatusAdapter.h
@@ -1,6 +1,7 @@
 #ifndef _IN_CSP_ADAPTERS_STATUSADAPTER_H
 #define _IN_CSP_ADAPTERS_STATUSADAPTER_H
 
+#include <csp/core/Platform.h>
 #include <csp/engine/PushInputAdapter.h>
 #include <string>
 
@@ -29,7 +30,7 @@ struct StatusLevelTraits
 
 using StatusLevel = csp::Enum<StatusLevelTraits>;
 
-class StatusAdapter : public PushInputAdapter
+class CSP_PUBLIC StatusAdapter : public PushInputAdapter
 {
 public:
     StatusAdapter( Engine * engine, CspTypePtr & type, PushMode pushMode, PushGroup * group = nullptr ) : PushInputAdapter( engine, type, pushMode, group )
diff --git a/cpp/csp/engine/Struct.h b/cpp/csp/engine/Struct.h
index 1b09cb97b..692ad842e 100644
--- a/cpp/csp/engine/Struct.h
+++ b/cpp/csp/engine/Struct.h
@@ -2,6 +2,7 @@
 #define _IN_CSP_ENGINE_STRUCT_H
 
 #include <csp/core/Hash.h>
+#include <csp/core/Platform.h>
 #include <csp/engine/CspType.h>
 #include <memory>
 #include <string>
@@ -18,7 +19,7 @@ class TypedStructPtr;
 
 using StructPtr = TypedStructPtr<Struct>;
 
-class StructField
+class CSP_PUBLIC StructField
 {
 public:
 
@@ -113,7 +114,7 @@ class StructField
 using StructFieldPtr = std::shared_ptr<StructField>;
 
 template<typename T>
-class NativeStructField : public StructField
+class CSP_PUBLIC NativeStructField : public StructField
 {
     static_assert( CspType::Type::fromCType<T>::type <= CspType::Type::MAX_NATIVE_TYPE );
     static_assert( sizeof(T) == alignof(T) );
@@ -176,7 +177,7 @@ using TimeDeltaStructField = NativeStructField<TimeDelta>;
 using DateStructField      = NativeStructField<Date>;
 using TimeStructField      = NativeStructField<Time>;
 
-class CspEnumStructField final : public NativeStructField<CspEnum>
+class CSP_PUBLIC CspEnumStructField final : public NativeStructField<CspEnum>
 {
 public:
     CspEnumStructField( CspTypePtr type, const std::string & fieldname ) : NativeStructField( type, fieldname )
@@ -184,7 +185,7 @@ class CspEnumStructField final : public NativeStructField<CspEnum>
 };
 
 template<typename T>
-class NotImplementedStructField : public StructField
+class CSP_PUBLIC NotImplementedStructField : public StructField
 {
 public:
     const T & value( const Struct * s ) const
@@ -215,7 +216,7 @@ class NotImplementedStructField : public StructField
 
 
 //Non-native fields need to have these specialized in dialect-specific code
-class NonNativeStructField : public StructField
+class CSP_PUBLIC NonNativeStructField : public StructField
 {
 public:
     NonNativeStructField( CspTypePtr type, const std::string &fieldname, size_t size, size_t alignment ) :
@@ -239,7 +240,7 @@ class NonNativeStructField : public StructField
     virtual void clearValueImpl( Struct * s ) const = 0;
 };
 
-class StringStructField final : public NonNativeStructField
+class CSP_PUBLIC StringStructField final : public NonNativeStructField
 {
 public:
     using CType = csp::CspType::StringCType;
@@ -309,7 +310,7 @@ class StringStructField final : public NonNativeStructField
 };
 
 template<typename CType>
-class ArrayStructField : public NonNativeStructField
+class CSP_PUBLIC ArrayStructField : public NonNativeStructField
 {
     using ElemT = typename CType::value_type;
 
@@ -418,7 +419,7 @@ class ArrayStructField : public NonNativeStructField
     }
 };
 
-class DialectGenericStructField : public NonNativeStructField
+class CSP_PUBLIC DialectGenericStructField : public NonNativeStructField
 {
 public:
     DialectGenericStructField( const std::string & fieldname, size_t size, size_t alignment ) :
@@ -478,7 +479,7 @@ class DialectGenericStructField : public NonNativeStructField
 };
 
 template<typename T>
-class TypedStructPtr
+class CSP_PUBLIC TypedStructPtr
 {
 public:
     TypedStructPtr() : m_obj( nullptr ) {}
@@ -580,7 +581,7 @@ TypedStructPtr<T> structptr_cast( const TypedStructPtr<U> & r )
     return out;
 }
 
-class StructMeta : public std::enable_shared_from_this<StructMeta>
+class CSP_PUBLIC StructMeta : public std::enable_shared_from_this<StructMeta>
 {
 public:
     using Fields = std::vector<StructFieldPtr>;
@@ -684,7 +685,7 @@ std::shared_ptr<typename StructField::upcast<T>::type> StructMeta::getMetaField(
 
 using StructMetaPtr = std::shared_ptr<StructMeta>;
 
-class Struct
+class CSP_PUBLIC Struct
 {
 public:
 
@@ -816,7 +817,7 @@ bool TypedStructPtr<T>::operator==( const TypedStructPtr<T> & rhs ) const
 }
 
 //field that is another struct
-class StructStructField final : public NonNativeStructField
+class CSP_PUBLIC StructStructField final : public NonNativeStructField
 {
 public:
     StructStructField( CspTypePtr cspType, const std::string &fieldname ) :
diff --git a/cpp/csp/engine/TickBuffer.h b/cpp/csp/engine/TickBuffer.h
index b3d94f20e..4dbcf52d0 100644
--- a/cpp/csp/engine/TickBuffer.h
+++ b/cpp/csp/engine/TickBuffer.h
@@ -6,6 +6,7 @@
  ** it uses a circular buffer for storage but only allows pushing back
  ** and resizing 
  ***********************************************************************/
+#include <csp/core/Platform.h>
 #include <csp/core/System.h>
 #include <csp/core/Time.h>
 #include <memory>
@@ -16,7 +17,7 @@ namespace csp
 {
 
 template< typename T >
-class TickBuffer
+class CSP_PUBLIC TickBuffer
 {
 public:
     TickBuffer( uint32_t capacity = 1 );
diff --git a/cpp/csp/engine/TimeSeries.h b/cpp/csp/engine/TimeSeries.h
index 0f5b43522..bad9b282c 100644
--- a/cpp/csp/engine/TimeSeries.h
+++ b/cpp/csp/engine/TimeSeries.h
@@ -3,6 +3,7 @@
 
 #include <csp/core/Enum.h>
 #include <csp/core/Exception.h>
+#include <csp/core/Platform.h>
 #include <csp/core/Time.h>
 #include <csp/engine/TickBuffer.h>
 
@@ -10,7 +11,7 @@ namespace csp
 {
 
 template<typename T>
-class TickBufferAccess
+class CSP_PUBLIC TickBufferAccess
 {
 public:
     TickBufferAccess() : m_buffer( nullptr ), m_lastValue() { }
@@ -55,7 +56,7 @@ class TickBufferAccess
     T m_lastValue;
 };
 
-class TimeSeries
+class CSP_PUBLIC TimeSeries
 {
 public:
     // Should match the DuplicatePolicy enum in python!!!
@@ -143,7 +144,7 @@ class TimeSeries
 };
 
 template< typename T >
-class TimeSeriesTyped : public TimeSeries
+class CSP_PUBLIC TimeSeriesTyped : public TimeSeries
 {
 public:
     TimeSeriesTyped() : m_dataline()
diff --git a/cpp/csp/engine/TimeSeriesProvider.h b/cpp/csp/engine/TimeSeriesProvider.h
index dbb0fd774..303be7e0e 100644
--- a/cpp/csp/engine/TimeSeriesProvider.h
+++ b/cpp/csp/engine/TimeSeriesProvider.h
@@ -2,6 +2,7 @@
 #define _IN_CSP_ENGINE_TIMESERIESPROVIDER_H
 
 #include <csp/core/Exception.h>
+#include <csp/core/Platform.h>
 #include <csp/engine/CspType.h>
 #include <csp/engine/EventPropagator.h>
 #include <csp/engine/TimeSeries.h>
@@ -13,7 +14,7 @@ class Consumer;
 class Node;
 
 //Holder of a single timeseries buffer and all associated links to consumers
-class TimeSeriesProvider
+class CSP_PUBLIC TimeSeriesProvider
 {
 public:
     using DuplicatePolicyEnum = TimeSeries::DuplicatePolicyEnum;
diff --git a/cpp/csp/engine/TimerInputAdapter.h b/cpp/csp/engine/TimerInputAdapter.h
index af72dabe5..b4cd00efc 100644
--- a/cpp/csp/engine/TimerInputAdapter.h
+++ b/cpp/csp/engine/TimerInputAdapter.h
@@ -1,13 +1,14 @@
 #ifndef _IN_CSP_ENGINE_TIMERINPUTADAPTER_H
 #define _IN_CSP_ENGINE_TIMERINPUTADAPTER_H
 
+#include <csp/core/Platform.h>
 #include <csp/engine/PullInputAdapter.h>
 
 namespace csp
 {
 
 template<typename T>
-class TimerInputAdapter : public PullInputAdapter<T>
+class CSP_PUBLIC TimerInputAdapter : public PullInputAdapter<T>
 {
 public:
     TimerInputAdapter( Engine * engine, CspTypePtr & type, TimeDelta interval, 
diff --git a/cpp/csp/engine/VectorContainer.h b/cpp/csp/engine/VectorContainer.h
index 4e211dc4e..280093025 100644
--- a/cpp/csp/engine/VectorContainer.h
+++ b/cpp/csp/engine/VectorContainer.h
@@ -1,11 +1,12 @@
 #ifndef _IN_CSP_ENGINE_VECTORALLOCATOR_H
 #define _IN_CSP_ENGINE_VECTORALLOCATOR_H
 
+#include <csp/core/Platform.h>
 #include <csp/engine/CspType.h>
 
 namespace csp
 {
-class VectorContainer
+class CSP_PUBLIC VectorContainer
 {
 public:
     VectorContainer(const VectorContainer&) = delete;
diff --git a/cpp/csp/engine/WindowBuffer.h b/cpp/csp/engine/WindowBuffer.h
index 3c7823b33..b7e10acd8 100644
--- a/cpp/csp/engine/WindowBuffer.h
+++ b/cpp/csp/engine/WindowBuffer.h
@@ -1,6 +1,7 @@
 #ifndef _IN_CSP_ENGINE_WINDOWBUFFER_H
 #define _IN_CSP_ENGINE_WINDOWBUFFER_H
 
+#include <csp/core/Platform.h>
 #include <csp/engine/CspType.h>
 
 /************************************************************************
@@ -15,7 +16,7 @@ namespace csp
 // Class declarations
 
 template<typename T>
-class WindowBuffer
+class CSP_PUBLIC WindowBuffer
 {
 public:
     WindowBuffer();
diff --git a/cpp/csp/python/Common.h b/cpp/csp/python/Common.h
index e8ecb0b1f..8d3c2a127 100644
--- a/cpp/csp/python/Common.h
+++ b/cpp/csp/python/Common.h
@@ -1,6 +1,7 @@
 #ifndef _IN_CSP_PYTHON_COMMON_H
 #define _IN_CSP_PYTHON_COMMON_H
 
+#include <csp/core/Platform.h>
 #include <Python.h>
 
 #define IS_PRE_PYTHON_3_11 (PY_MAJOR_VERSION < 3 || (PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION < 11) )
@@ -10,7 +11,7 @@
 namespace csp::python
 {
 
-class AcquireGIL
+class CSP_PUBLIC AcquireGIL
 {
 public:
     AcquireGIL()  { m_state = PyGILState_Ensure(); }
@@ -20,7 +21,7 @@ class AcquireGIL
     PyGILState_STATE m_state;
 };
 
-class ReleaseGIL
+class CSP_PUBLIC ReleaseGIL
 {
 public:
     ReleaseGIL()  { m_saveState = PyEval_SaveThread(); }
diff --git a/cpp/csp/python/NumpyInputAdapter.h b/cpp/csp/python/NumpyInputAdapter.h
index 0d4bd7c8b..c36323289 100644
--- a/cpp/csp/python/NumpyInputAdapter.h
+++ b/cpp/csp/python/NumpyInputAdapter.h
@@ -1,6 +1,7 @@
 #ifndef _IN_CSP_PYTHON_NUMPYINPUTADAPTER_H
 #define _IN_CSP_PYTHON_NUMPYINPUTADAPTER_H
 
+#include <csp/core/Platform.h>
 #include <csp/engine/PullInputAdapter.h>
 #include <csp/python/NumpyConversions.h>
 
@@ -11,7 +12,7 @@
 namespace csp::python
 {
 
-class NumpyCurveAccessor
+class CSP_PUBLIC NumpyCurveAccessor
 {
     // Accesses values by indexing only on the outermost dimension of an n-dimensional Numpy array and then creating a view to the subarray
     // Thus, you can get the nested Numpy array values in csp.curve with zero-copy operations
diff --git a/cpp/csp/python/PyAdapterManager.h b/cpp/csp/python/PyAdapterManager.h
index 0e537f3b9..9469fd865 100644
--- a/cpp/csp/python/PyAdapterManager.h
+++ b/cpp/csp/python/PyAdapterManager.h
@@ -2,13 +2,14 @@
 #define _IN_CSP_PYTHON_PYADAPTERMANAGER_H
 
 #include <Python.h>
+#include <csp/core/Platform.h>
 
 namespace csp { class AdapterManager; }
 
 namespace csp::python
 {
 
-struct PyAdapterManager_PyObject
+struct CSP_PUBLIC PyAdapterManager_PyObject
 {
     PyObject_HEAD
     csp::AdapterManager * manager;
diff --git a/cpp/csp/python/PyAdapterManagerWrapper.h b/cpp/csp/python/PyAdapterManagerWrapper.h
index 9503f0473..91e13394c 100644
--- a/cpp/csp/python/PyAdapterManagerWrapper.h
+++ b/cpp/csp/python/PyAdapterManagerWrapper.h
@@ -2,6 +2,7 @@
 #define _IN_CSP_PYTHON_PYADAPTERMANAGERWRAPPER_H
 
 #include <Python.h>
+#include <csp/core/Platform.h>
 #include <csp/python/Exception.h>
 #include <csp/python/InitHelper.h>
 
diff --git a/cpp/csp/python/PyBasketInputProxy.h b/cpp/csp/python/PyBasketInputProxy.h
index 6617f4e22..bd70c9f52 100644
--- a/cpp/csp/python/PyBasketInputProxy.h
+++ b/cpp/csp/python/PyBasketInputProxy.h
@@ -1,6 +1,7 @@
 #ifndef _IN_CSP_PYTHON_PYBASKETINPUTPROXY_H
 #define _IN_CSP_PYTHON_PYBASKETINPUTPROXY_H
 
+#include <csp/core/Platform.h>
 #include <csp/engine/InputId.h>
 #include <csp/python/Conversions.h>
 #include <Python.h>
@@ -14,7 +15,7 @@ class PyInputProxy;
 using PyInputProxyPtr = PyPtr<PyInputProxy>; 
 class PyNode;
 
-class PyBaseBasketInputProxy : public PyObject
+class CSP_PUBLIC PyBaseBasketInputProxy : public PyObject
 {
 public:
     PyBaseBasketInputProxy( PyNode * node, INOUT_ID_TYPE id );
@@ -37,7 +38,7 @@ class PyBaseBasketInputProxy : public PyObject
 };
 
 
-class PyListBasketInputProxy final: public PyBaseBasketInputProxy
+class CSP_PUBLIC PyListBasketInputProxy final: public PyBaseBasketInputProxy
 {
 public:
     PyListBasketInputProxy( PyNode * node, INOUT_ID_TYPE id, size_t shape );
@@ -62,7 +63,7 @@ class PyListBasketInputProxy final: public PyBaseBasketInputProxy
 };
 
 
-class PyDictBasketInputProxy : public PyBaseBasketInputProxy
+class CSP_PUBLIC PyDictBasketInputProxy : public PyBaseBasketInputProxy
 {
 public:
     PyDictBasketInputProxy( PyNode * node, INOUT_ID_TYPE id, PyObject * shape );
@@ -85,7 +86,7 @@ class PyDictBasketInputProxy : public PyBaseBasketInputProxy
     PyObjectPtr m_proxyMapping;
 };
 
-class PyDynamicBasketInputProxy final : public PyDictBasketInputProxy
+class CSP_PUBLIC PyDynamicBasketInputProxy final : public PyDictBasketInputProxy
 {
 public:
     PyDynamicBasketInputProxy( PyNode * node, INOUT_ID_TYPE id, PyObject * shape );
diff --git a/cpp/csp/python/PyBasketOutputProxy.h b/cpp/csp/python/PyBasketOutputProxy.h
index 1d9aea51d..b390f4fb9 100644
--- a/cpp/csp/python/PyBasketOutputProxy.h
+++ b/cpp/csp/python/PyBasketOutputProxy.h
@@ -1,6 +1,7 @@
 #ifndef _IN_CSP_PYTHON_PYBASKETOUTPUTPROXY_H
 #define _IN_CSP_PYTHON_PYBASKETOUTPUTPROXY_H
 
+#include <csp/core/Platform.h>
 #include <csp/engine/InputId.h>
 #include <csp/python/Conversions.h>
 #include <Python.h>
@@ -12,7 +13,7 @@ class PyOutputProxy;
 using PyOutputProxyPtr = PyPtr<PyOutputProxy>;
 class PyNode;
 
-class PyBaseBasketOutputProxy : public PyObject
+class CSP_PUBLIC PyBaseBasketOutputProxy : public PyObject
 {
 public:
     PyBaseBasketOutputProxy( Node * node, INOUT_ID_TYPE id );
@@ -22,7 +23,7 @@ class PyBaseBasketOutputProxy : public PyObject
     INOUT_ID_TYPE                 m_id;
 };
 
-class PyListBasketOutputProxy final : public PyBaseBasketOutputProxy
+class CSP_PUBLIC PyListBasketOutputProxy final : public PyBaseBasketOutputProxy
 {
 public:
     PyListBasketOutputProxy( PyObject *pyType, Node * node, INOUT_ID_TYPE id, size_t shape );
@@ -43,7 +44,7 @@ class PyListBasketOutputProxy final : public PyBaseBasketOutputProxy
     std::vector<PyOutputProxyPtr> m_proxies;
 };
 
-class PyDictBasketOutputProxy : public PyBaseBasketOutputProxy
+class CSP_PUBLIC PyDictBasketOutputProxy : public PyBaseBasketOutputProxy
 {
 public:
     PyDictBasketOutputProxy( PyObject *pyType, Node * node, INOUT_ID_TYPE id, PyObject * shape );
@@ -58,7 +59,7 @@ class PyDictBasketOutputProxy : public PyBaseBasketOutputProxy
     PyObjectPtr m_proxyMapping;
 };
 
-class PyDynamicBasketOutputProxy final : public PyDictBasketOutputProxy
+class CSP_PUBLIC PyDynamicBasketOutputProxy final : public PyDictBasketOutputProxy
 {
 public:
     PyDynamicBasketOutputProxy( PyObject *pyType, Node * node, INOUT_ID_TYPE id, PyObject * shape );
diff --git a/cpp/csp/python/PyEngine.h b/cpp/csp/python/PyEngine.h
index d58289501..53589f44e 100644
--- a/cpp/csp/python/PyEngine.h
+++ b/cpp/csp/python/PyEngine.h
@@ -1,6 +1,7 @@
 #ifndef _IN_CSP_PYTHON_PYENGINE_H
 #define _IN_CSP_PYTHON_PYENGINE_H
 
+#include <csp/core/Platform.h>
 #include <csp/core/Time.h>
 #include <csp/python/Exception.h>
 #include <csp/engine/RootEngine.h>
@@ -16,7 +17,7 @@ namespace csp::python
 class PyEngine;
 
 //This is the actual python root engine
-class PythonEngine final : public csp::RootEngine
+class CSP_PUBLIC PythonEngine final : public csp::RootEngine
 {
 public:
     PythonEngine( PyEngine * parent, const Dictionary & );
diff --git a/cpp/csp/python/PyGraphOutputAdapter.h b/cpp/csp/python/PyGraphOutputAdapter.h
index f7fd8daf1..7eeb0fac5 100644
--- a/cpp/csp/python/PyGraphOutputAdapter.h
+++ b/cpp/csp/python/PyGraphOutputAdapter.h
@@ -1,13 +1,14 @@
 #ifndef _IN_CSP_PYTHON_PYGRAPHOUPUTADAPTER_H
 #define _IN_CSP_PYTHON_PYGRAPHOUPUTADAPTER_H
 
+#include <csp/core/Platform.h>
 #include <csp/engine/GraphOutputAdapter.h>
 #include <csp/python/PyObjectPtr.h>
 
 namespace csp::python
 {
 
-class PyGraphOutputAdapter : public GraphOutputAdapter
+class CSP_PUBLIC PyGraphOutputAdapter : public GraphOutputAdapter
 {
 public:
     using GraphOutputAdapter::GraphOutputAdapter;
diff --git a/cpp/csp/python/PyInputProxy.h b/cpp/csp/python/PyInputProxy.h
index b392a2a52..850c0e7b4 100644
--- a/cpp/csp/python/PyInputProxy.h
+++ b/cpp/csp/python/PyInputProxy.h
@@ -1,6 +1,7 @@
 #ifndef _IN_CSP_PYTHON_PYINPUTPROXY_H
 #define _IN_CSP_PYTHON_PYINPUTPROXY_H
 
+#include <csp/core/Platform.h>
 #include <csp/engine/InputId.h>
 #include <csp/python/Conversions.h>
 #include <csp/python/NumpyConversions.h>
@@ -11,7 +12,7 @@ namespace csp::python
 
 class PyNode;
 
-class PyInputProxy : public PyObject
+class CSP_PUBLIC PyInputProxy : public PyObject
 {
 public:
     PyInputProxy( PyNode * node, InputId id );
diff --git a/cpp/csp/python/PyNode.h b/cpp/csp/python/PyNode.h
index 248943ae9..579896d16 100644
--- a/cpp/csp/python/PyNode.h
+++ b/cpp/csp/python/PyNode.h
@@ -1,6 +1,7 @@
 #ifndef _IN_CSP_PYTHON_PYNODE_H
 #define _IN_CSP_PYTHON_PYNODE_H
 
+#include <csp/core/Platform.h>
 #include <csp/core/Time.h>
 #include <csp/engine/Node.h>
 #include <csp/python/PyObjectPtr.h>
@@ -11,7 +12,7 @@ namespace csp::python
 
 class PyEngine;
 
-class PyNode final: public csp::Node
+class CSP_PUBLIC PyNode final: public csp::Node
 {
 public:
     PyNode( csp::Engine * engine, PyObjectPtr gen, PyObjectPtr inputs, PyObjectPtr outputs,
diff --git a/cpp/csp/python/PyNodeWrapper.h b/cpp/csp/python/PyNodeWrapper.h
index 0af60d305..6e3ebe5f0 100644
--- a/cpp/csp/python/PyNodeWrapper.h
+++ b/cpp/csp/python/PyNodeWrapper.h
@@ -1,3 +1,7 @@
+#ifndef _IN_CSP_PYTHON_PYNODEWRAPPER_H
+#define _IN_CSP_PYTHON_PYNODEWRAPPER_H
+
+#include <csp/core/Platform.h>
 #include <csp/engine/Node.h>
 #include <Python.h>
 
@@ -5,7 +9,7 @@ namespace csp::python
 {
 
 //simple wrapper for python level access when wiring
-class PyNodeWrapper : public PyObject
+class CSP_PUBLIC PyNodeWrapper : public PyObject
 {
 public:
     csp::Node * node() { return m_node; }
@@ -20,3 +24,5 @@ class PyNodeWrapper : public PyObject
 };
 
 }
+
+#endif
\ No newline at end of file
diff --git a/cpp/csp/python/PyNumbaNode.h b/cpp/csp/python/PyNumbaNode.h
index cc71a05fe..f9fe1f349 100644
--- a/cpp/csp/python/PyNumbaNode.h
+++ b/cpp/csp/python/PyNumbaNode.h
@@ -1,6 +1,7 @@
 #ifndef _IN_PYTHON_PYNUMBANODE_H
 #define _IN_PYTHON_PYNUMBANODE_H
 
+#include <csp/core/Platform.h>
 #include <csp/core/Time.h>
 #include <csp/engine/Node.h>
 #include <csp/python/PyObjectPtr.h>
@@ -12,7 +13,7 @@ class PyEngine;
 
 typedef void (*CallbackType)(void *node, void *state);
 
-class PyNumbaNode final : public csp::Node
+class CSP_PUBLIC PyNumbaNode final : public csp::Node
 {
 public:
     // TODO: Add suppot for initialization callback as well
diff --git a/cpp/csp/python/PyOutputProxy.h b/cpp/csp/python/PyOutputProxy.h
index 4b63a9857..a5c3ea75e 100644
--- a/cpp/csp/python/PyOutputProxy.h
+++ b/cpp/csp/python/PyOutputProxy.h
@@ -1,6 +1,7 @@
 #ifndef _IN_CSP_PYTHON_PYOUTPUTPROXY_H
 #define _IN_CSP_PYTHON_PYOUTPUTPROXY_H
 
+#include <csp/core/Platform.h>
 #include <csp/engine/Node.h>
 #include <csp/engine/InputId.h>
 #include <Python.h>
@@ -8,7 +9,7 @@
 namespace csp::python
 {
 
-class PyOutputProxy final: public PyObject
+class CSP_PUBLIC PyOutputProxy final: public PyObject
 {
 public:
     PyOutputProxy( PyObject *pyType, Node * node, OutputId );
diff --git a/cpp/csp/python/PyPushInputAdapter.h b/cpp/csp/python/PyPushInputAdapter.h
index 525f8bf3c..525bfa3d6 100644
--- a/cpp/csp/python/PyPushInputAdapter.h
+++ b/cpp/csp/python/PyPushInputAdapter.h
@@ -1,13 +1,14 @@
 #ifndef _IN_CSP_PYTHON_PYPUSHINPUTADAPTER_H
 #define _IN_CSP_PYTHON_PYPUSHINPUTADAPTER_H
 
+#include <csp/core/Platform.h>
 #include <csp/engine/PushInputAdapter.h>
 
 namespace csp::python
 {
 
 //PushBatch
-struct PyPushBatch
+struct CSP_PUBLIC PyPushBatch
 {
     PyObject_HEAD
     PushBatch batch;
diff --git a/cpp/csp/python/PyStructFastList.h b/cpp/csp/python/PyStructFastList.h
index 4c065c48a..39da2075f 100644
--- a/cpp/csp/python/PyStructFastList.h
+++ b/cpp/csp/python/PyStructFastList.h
@@ -1,6 +1,7 @@
 #ifndef _IN_CSP_PYTHON_PYSTRUCTFASTLIST_H
 #define _IN_CSP_PYTHON_PYSTRUCTFASTLIST_H
 
+#include <csp/core/Platform.h>
 #include <csp/python/Conversions.h>
 #include <csp/python/InitHelper.h>
 #include <csp/python/PyIterator.h>
@@ -13,7 +14,7 @@ namespace csp::python
 {
 
 template<typename StorageT>
-struct PyStructFastList : public PyObject
+struct CSP_PUBLIC PyStructFastList : public PyObject
 {
     using ElemT = typename CspType::Type::toCArrayElemType<StorageT>::type;
 
diff --git a/cpp/csp/python/PyStructList.h b/cpp/csp/python/PyStructList.h
index 3c51758e2..136570fe8 100644
--- a/cpp/csp/python/PyStructList.h
+++ b/cpp/csp/python/PyStructList.h
@@ -1,6 +1,7 @@
 #ifndef _IN_CSP_PYTHON_PYSTRUCTLIST_H
 #define _IN_CSP_PYTHON_PYSTRUCTLIST_H
 
+#include <csp/core/Platform.h>
 #include <csp/python/InitHelper.h>
 #include <csp/python/PyStruct.h>
 #include <csp/python/VectorWrapper.h>
@@ -11,7 +12,7 @@ namespace csp::python
 {
 
 template<typename StorageT>
-struct PyStructList : public PyObject
+struct CSP_PUBLIC PyStructList : public PyObject
 {
     using ElemT = typename CspType::Type::toCArrayElemType<StorageT>::type;