diff --git a/cpp/csp/adapters/kafka/KafkaAdapterManager.h b/cpp/csp/adapters/kafka/KafkaAdapterManager.h
index bf4e2315..4b494037 100644
--- a/cpp/csp/adapters/kafka/KafkaAdapterManager.h
+++ b/cpp/csp/adapters/kafka/KafkaAdapterManager.h
@@ -47,7 +47,7 @@ struct KafkaStatusMessageTypeTraits
 using KafkaStatusMessageType = csp::Enum<KafkaStatusMessageTypeTraits>;
 
 //Top level AdapterManager object for all kafka adapters in the engine
-class CSP_PUBLIC KafkaAdapterManager final : public csp::AdapterManager
+class CSPIMPL_EXPORT KafkaAdapterManager final : public csp::AdapterManager
 {
 public:
     KafkaAdapterManager( csp::Engine * engine, const Dictionary & properties );
diff --git a/cpp/csp/adapters/parquet/DialectGenericListReaderInterface.h b/cpp/csp/adapters/parquet/DialectGenericListReaderInterface.h
index 61b77cd8..a7c3611c 100644
--- a/cpp/csp/adapters/parquet/DialectGenericListReaderInterface.h
+++ b/cpp/csp/adapters/parquet/DialectGenericListReaderInterface.h
@@ -25,7 +25,7 @@ class DialectGenericListReaderInterface
 };
 
 template< typename T >
-class CSP_PUBLIC TypedDialectGenericListReaderInterface : public DialectGenericListReaderInterface
+class CSPIMPL_EXPORT TypedDialectGenericListReaderInterface : public DialectGenericListReaderInterface
 {
 public:
     using Ptr = std::shared_ptr<TypedDialectGenericListReaderInterface<T>>;
diff --git a/cpp/csp/adapters/parquet/ParquetInputAdapterManager.h b/cpp/csp/adapters/parquet/ParquetInputAdapterManager.h
index 8f3effa1..6768ee3e 100644
--- a/cpp/csp/adapters/parquet/ParquetInputAdapterManager.h
+++ b/cpp/csp/adapters/parquet/ParquetInputAdapterManager.h
@@ -18,7 +18,7 @@ namespace csp::adapters::parquet
 
 
 //Top level AdapterManager object for all parquet adapters in the engine
-class CSP_PUBLIC ParquetInputAdapterManager final : public csp::AdapterManager
+class CSPIMPL_EXPORT ParquetInputAdapterManager final : public csp::AdapterManager
 {
 public:
     using GeneratorPtr = csp::Generator<std::string, csp::DateTime, csp::DateTime>::Ptr;
diff --git a/cpp/csp/adapters/parquet/ParquetOutputAdapterManager.h b/cpp/csp/adapters/parquet/ParquetOutputAdapterManager.h
index b7fe029f..666d3856 100644
--- a/cpp/csp/adapters/parquet/ParquetOutputAdapterManager.h
+++ b/cpp/csp/adapters/parquet/ParquetOutputAdapterManager.h
@@ -21,7 +21,7 @@ class ParquetOutputFilenameAdapter;
 class ParquetDictBasketOutputWriter;
 
 //Top level AdapterManager object for all parquet adapters in the engine
-class CSP_PUBLIC ParquetOutputAdapterManager final : public csp::AdapterManager
+class CSPIMPL_EXPORT ParquetOutputAdapterManager final : public csp::AdapterManager
 {
 public:
     using FileVisitorCallback = std::function<void(const std::string &)>;
diff --git a/cpp/csp/adapters/websocket/ClientAdapterManager.h b/cpp/csp/adapters/websocket/ClientAdapterManager.h
index b2b15fa7..48a44666 100644
--- a/cpp/csp/adapters/websocket/ClientAdapterManager.h
+++ b/cpp/csp/adapters/websocket/ClientAdapterManager.h
@@ -40,7 +40,7 @@ struct WebsocketClientStatusTypeTraits
 
 using ClientStatusType = Enum<WebsocketClientStatusTypeTraits>;
 
-class CSP_PUBLIC ClientAdapterManager final : public AdapterManager
+class CSPIMPL_EXPORT ClientAdapterManager final : public AdapterManager
 {
 public:
     ClientAdapterManager(
diff --git a/cpp/csp/core/BasicAllocator.h b/cpp/csp/core/BasicAllocator.h
index 029518a7..2f7648f7 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 CSP_PUBLIC BasicAllocator
+class CSPIMPL_EXPORT 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 eb4a950f..95258556 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 CSP_PUBLIC DynamicBitSet
+class CSPIMPL_EXPORT DynamicBitSet
 {
 
 public:
diff --git a/cpp/csp/core/Enum.h b/cpp/csp/core/Enum.h
index 428dadee..1a648503 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 CSP_PUBLIC Enum : public EnumTraits
+struct CSPIMPL_EXPORT 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 49c0fdac..164116f0 100644
--- a/cpp/csp/core/EnumBitSet.h
+++ b/cpp/csp/core/EnumBitSet.h
@@ -14,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 CSP_PUBLIC EnumBitSet
+class CSPIMPL_EXPORT EnumBitSet
 {
     using value_type = uint64_t;
 
diff --git a/cpp/csp/core/Exception.h b/cpp/csp/core/Exception.h
index 5227acf3..5188104f 100644
--- a/cpp/csp/core/Exception.h
+++ b/cpp/csp/core/Exception.h
@@ -10,7 +10,7 @@
 namespace csp
 {
 
-class CSP_PUBLIC Exception : public std::exception
+class CSPIMPL_EXPORT Exception : public std::exception
 {
 public:
     Exception( const char * exType, const std::string & description, const char * file, const char * func, int line ) :
@@ -59,7 +59,7 @@ class CSP_PUBLIC Exception : public std::exception
 };
 
 #define __FILENAME__ (strrchr(__FILE__, '/') ? strrchr(__FILE__, '/') + 1 : __FILE__)
-#define CSP_DECLARE_EXCEPTION( DerivedException, BaseException ) class CSP_PUBLIC DerivedException : public BaseException { public: DerivedException( const char * exType, const std::string &r, const char * file, const char * func, int line ) : BaseException( exType, r, file, func, line ) {} };
+#define CSP_DECLARE_EXCEPTION( DerivedException, BaseException ) class CSPIMPL_EXPORT DerivedException : public BaseException { public: DerivedException( const char * exType, const std::string &r, const char * file, const char * func, int line ) : BaseException( exType, r, file, func, line ) {} };
 
 CSP_DECLARE_EXCEPTION( AssertionError,     Exception )
 CSP_DECLARE_EXCEPTION( RuntimeException,   Exception )
diff --git a/cpp/csp/core/Generator.h b/cpp/csp/core/Generator.h
index fabd1e8e..257d53b1 100644
--- a/cpp/csp/core/Generator.h
+++ b/cpp/csp/core/Generator.h
@@ -7,7 +7,7 @@
 namespace csp
 {
 template< typename V, typename ...Args >
-class CSP_PUBLIC Generator
+class CSPIMPL_EXPORT Generator
 {
 public:
     using Ptr = std::shared_ptr<Generator<V, Args...>>;
diff --git a/cpp/csp/core/Platform.h b/cpp/csp/core/Platform.h
index eb6e0c05..5b9f401b 100644
--- a/cpp/csp/core/Platform.h
+++ b/cpp/csp/core/Platform.h
@@ -15,7 +15,6 @@
 #undef GetMessage
 
 #define CSP_LOCAL
-#define CSP_PUBLIC __declspec(dllexport)
 
 #ifdef CSPTYPESIMPL_EXPORTS
 #define CSPTYPESIMPL_EXPORT __declspec(dllexport)
@@ -94,7 +93,6 @@ inline uint8_t ffs(uint64_t n)
 #define CSPTYPESIMPL_EXPORT __attribute__ ((visibility ("default")))
 
 #define CSP_LOCAL  __attribute__ ((visibility ("hidden")))
-#define CSP_PUBLIC __attribute__ ((visibility ("default")))
 
 #define START_PACKED
 #define END_PACKED __attribute__((packed))
diff --git a/cpp/csp/core/QueueWaiter.h b/cpp/csp/core/QueueWaiter.h
index d8d40bb8..01e4bbc4 100644
--- a/cpp/csp/core/QueueWaiter.h
+++ b/cpp/csp/core/QueueWaiter.h
@@ -14,7 +14,7 @@ namespace csp
 
 class TimeDelta;
 
-class CSP_PUBLIC QueueWaiter
+class CSPIMPL_EXPORT QueueWaiter
 {
 public:
     QueueWaiter() : m_eventsPending( false )
diff --git a/cpp/csp/core/TaggedPointerUnion.h b/cpp/csp/core/TaggedPointerUnion.h
index 358bc174..635001c3 100644
--- a/cpp/csp/core/TaggedPointerUnion.h
+++ b/cpp/csp/core/TaggedPointerUnion.h
@@ -26,7 +26,7 @@ struct IndexOf<T, TypeList<TOther, Ts...> >
 
 
 template<typename... Ts>
-class CSP_PUBLIC TaggedPointerUnion
+class CSPIMPL_EXPORT 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 0ac03fd0..9aef56b2 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 CSP_PUBLIC TimeDelta
+class CSPIMPL_EXPORT TimeDelta
 {
 public:
     constexpr TimeDelta() : TimeDelta( TimeDelta::NONE() ) {}
@@ -165,7 +165,7 @@ inline std::ostream & operator <<( std::ostream &os, const TimeDelta & d )
     return os;
 }
 
-class CSP_PUBLIC Date
+class CSPIMPL_EXPORT Date
 {
 public:
     Date() : Date( NONE() ) {}
@@ -316,7 +316,7 @@ inline std::ostream & operator <<( std::ostream &os, const Date & d )
     return os;
 }
 
-class CSP_PUBLIC Time
+class CSPIMPL_EXPORT 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 CSP_PUBLIC DateTime
+class CSPIMPL_EXPORT 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 CSP_PUBLIC DateTimeEx : public DateTime
+class CSPIMPL_EXPORT DateTimeEx : public DateTime
 {
 public:
     DateTimeEx( const DateTime & dt );
diff --git a/cpp/csp/engine/AdapterManager.h b/cpp/csp/engine/AdapterManager.h
index 52e24396..a1c32331 100644
--- a/cpp/csp/engine/AdapterManager.h
+++ b/cpp/csp/engine/AdapterManager.h
@@ -17,7 +17,7 @@ class AdapterManager;
 
 class Engine;
 
-class CSP_PUBLIC ManagedSimInputAdapter : public InputAdapter
+class CSPIMPL_EXPORT ManagedSimInputAdapter : public InputAdapter
 {
 public:
     ManagedSimInputAdapter( csp::Engine *engine, const CspTypePtr &type, AdapterManager *manager, PushMode pushMode );
@@ -94,7 +94,7 @@ bool ManagedSimInputAdapter::pushNullTick()
     return true;
 }
 
-class CSP_PUBLIC AdapterManager : public EngineOwned
+class CSPIMPL_EXPORT AdapterManager : public EngineOwned
 {
 public:
     AdapterManager( csp::Engine * );
diff --git a/cpp/csp/engine/AlarmInputAdapter.h b/cpp/csp/engine/AlarmInputAdapter.h
index f0428bac..d34d1641 100644
--- a/cpp/csp/engine/AlarmInputAdapter.h
+++ b/cpp/csp/engine/AlarmInputAdapter.h
@@ -9,7 +9,7 @@ namespace csp
 {
 
 template<typename T>
-class CSP_PUBLIC AlarmInputAdapter final : public InputAdapter
+class CSPIMPL_EXPORT 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 cd4da8a0..10c14e7c 100644
--- a/cpp/csp/engine/BasketInfo.h
+++ b/cpp/csp/engine/BasketInfo.h
@@ -13,7 +13,7 @@ namespace csp
 
 class Node;
 
-class CSP_PUBLIC InputBasketInfo
+class CSPIMPL_EXPORT InputBasketInfo
 {
     using TickedInputs = std::vector<INOUT_ELEMID_TYPE>;
 
@@ -189,7 +189,7 @@ class CSP_PUBLIC InputBasketInfo
     bool                        m_isDynamic;
 };
 
-class CSP_PUBLIC DynamicInputBasketInfo : public InputBasketInfo
+class CSPIMPL_EXPORT DynamicInputBasketInfo : public InputBasketInfo
 {
 public:
     using ChangeCallback = std::function<void(const DialectGenericType & key,bool added, int64_t elemId, int64_t replaceId )>;
@@ -228,7 +228,7 @@ class CSP_PUBLIC DynamicInputBasketInfo : public InputBasketInfo
     TimeDelta         m_timeWindowPolicy;
 };
 
-class CSP_PUBLIC OutputBasketInfo
+class CSPIMPL_EXPORT OutputBasketInfo
 {
 public:
     OutputBasketInfo( CspTypePtr & type, Node * node, size_t size, bool isDynamic = false );
@@ -255,7 +255,7 @@ class CSP_PUBLIC OutputBasketInfo
     bool                   m_isDynamic;
 };
 
-class CSP_PUBLIC DynamicOutputBasketInfo : public OutputBasketInfo
+class CSPIMPL_EXPORT DynamicOutputBasketInfo : public OutputBasketInfo
 {
 public:
     DynamicOutputBasketInfo( CspTypePtr & type, Node * node );
diff --git a/cpp/csp/engine/Consumer.h b/cpp/csp/engine/Consumer.h
index 22bcc077..d5b3f571 100644
--- a/cpp/csp/engine/Consumer.h
+++ b/cpp/csp/engine/Consumer.h
@@ -14,7 +14,7 @@ namespace csp
 class InputAdapter;
 
 //Base of either regular Nodes or output adapters
-class CSP_PUBLIC Consumer
+class CSPIMPL_EXPORT Consumer
 {
 public:
     Consumer( Engine * );
diff --git a/cpp/csp/engine/CppNode.h b/cpp/csp/engine/CppNode.h
index 22a7a0a0..6cc2c959 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 CSP_PUBLIC CppNode : public csp::Node
+class CSPIMPL_EXPORT 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 05e236c7..dd5000de 100644
--- a/cpp/csp/engine/CspEnum.h
+++ b/cpp/csp/engine/CspEnum.h
@@ -15,7 +15,7 @@ namespace csp
 
 class CspEnumMeta;
 
-class CSP_PUBLIC CspEnumInstance
+class CSPIMPL_EXPORT CspEnumInstance
 {
 public:
     CspEnumInstance( std::string name, int64_t value, csp::CspEnumMeta * meta ) : m_name( name ), m_value( value ), m_meta( meta ) {}
@@ -35,7 +35,7 @@ class CSP_PUBLIC 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 CSP_PUBLIC CspEnum
+class CSPIMPL_EXPORT CspEnum
 {
 public:
     CspEnum();
@@ -59,7 +59,7 @@ class CSP_PUBLIC CspEnum
 
 std::ostream &operator<<( std::ostream &os, const CspEnum & rhs );
 
-class CSP_PUBLIC CspEnumMeta
+class CSPIMPL_EXPORT 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 c3c070bb..97e5fdea 100644
--- a/cpp/csp/engine/CspType.h
+++ b/cpp/csp/engine/CspType.h
@@ -15,7 +15,7 @@ namespace csp
 
 class CspStringType;
 
-class CSP_PUBLIC CspType
+class CSPIMPL_EXPORT CspType
 {
 public:
 
@@ -116,7 +116,7 @@ class CSP_PUBLIC CspType
     Type m_type;
 };
 
-class CSP_PUBLIC CspStringType : public CspType
+class CSPIMPL_EXPORT CspStringType : public CspType
 {
 public:
     CspStringType(bool isBytes)
@@ -135,7 +135,7 @@ class CspEnum;
 
 class CspEnumMeta;
 
-class CSP_PUBLIC CspEnumType : public CspType
+class CSPIMPL_EXPORT CspEnumType : public CspType
 {
 public:
     CspEnumType( std::shared_ptr<CspEnumMeta> & meta ) : CspType( CspType::Type::ENUM ),
@@ -155,7 +155,7 @@ using StructPtr = TypedStructPtr<Struct>;
 
 class StructMeta;
 
-class CSP_PUBLIC CspStructType : public CspType
+class CSPIMPL_EXPORT CspStructType : public CspType
 {
 public:
     CspStructType( const std::shared_ptr<StructMeta> & meta ) : CspType( CspType::Type::STRUCT ),
@@ -168,7 +168,7 @@ class CSP_PUBLIC CspStructType : public CspType
     std::shared_ptr<StructMeta> m_meta;
 };
 
-class CSP_PUBLIC CspArrayType : public CspType
+class CSPIMPL_EXPORT 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 43537764..994dda24 100644
--- a/cpp/csp/engine/CycleStepTable.h
+++ b/cpp/csp/engine/CycleStepTable.h
@@ -12,7 +12,7 @@ namespace csp
 class Consumer;
 class Profiler;
     
-class CSP_PUBLIC CycleStepTable
+class CSPIMPL_EXPORT CycleStepTable
 {
 public:
     CycleStepTable();
diff --git a/cpp/csp/engine/Dictionary.h b/cpp/csp/engine/Dictionary.h
index faf6193f..99ad88db 100644
--- a/cpp/csp/engine/Dictionary.h
+++ b/cpp/csp/engine/Dictionary.h
@@ -23,7 +23,7 @@ using DictionaryPtr = std::shared_ptr<Dictionary>;
 class StructMeta;
 using StructMetaPtr = std::shared_ptr<StructMeta>;
 
-class CSP_PUBLIC Dictionary
+class CSPIMPL_EXPORT Dictionary
 {
 public:
     struct Data;
diff --git a/cpp/csp/engine/DynamicEngine.h b/cpp/csp/engine/DynamicEngine.h
index aa2b4130..764f67a6 100644
--- a/cpp/csp/engine/DynamicEngine.h
+++ b/cpp/csp/engine/DynamicEngine.h
@@ -10,7 +10,7 @@
 namespace csp
 {
 
-class CSP_PUBLIC DynamicEngine final : public Engine
+class CSPIMPL_EXPORT 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 6434cf26..be6abbbe 100644
--- a/cpp/csp/engine/DynamicNode.h
+++ b/cpp/csp/engine/DynamicNode.h
@@ -18,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 CSP_PUBLIC DynamicNode final : public Node
+class CSPIMPL_EXPORT 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 23afb256..a9ed9b38 100644
--- a/cpp/csp/engine/Engine.h
+++ b/cpp/csp/engine/Engine.h
@@ -24,7 +24,7 @@ class TimeSeriesProvider;
 class Engine;
 class RootEngine;
 
-struct CSP_PUBLIC EngineOwned
+struct CSPIMPL_EXPORT EngineOwned
 {
     //force objects derived from EngineOwned to go through engine createOwnedObject methods
     //little trick here to force all derivations to fail
@@ -35,7 +35,7 @@ struct CSP_PUBLIC EngineOwned
     void operator delete( void* ptr )            { ::operator delete(ptr); }
 };
 
-class CSP_PUBLIC Engine
+class CSPIMPL_EXPORT 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 0a45bb28..b61fcdba 100644
--- a/cpp/csp/engine/Enums.h
+++ b/cpp/csp/engine/Enums.h
@@ -8,7 +8,7 @@ namespace csp
 {
 
 // NOTE this must align with the python side Enum definition ///
-struct CSP_PUBLIC PushModeTraits
+struct CSPIMPL_EXPORT PushModeTraits
 {
     enum _enum : unsigned char
     {
diff --git a/cpp/csp/engine/EventPropagator.h b/cpp/csp/engine/EventPropagator.h
index 77e45ca4..7c81b277 100644
--- a/cpp/csp/engine/EventPropagator.h
+++ b/cpp/csp/engine/EventPropagator.h
@@ -10,7 +10,7 @@ namespace csp
 
 class Consumer;
 
-class CSP_PUBLIC EventPropagator
+class CSPIMPL_EXPORT EventPropagator
 {
 public:
     EventPropagator();
diff --git a/cpp/csp/engine/Feedback.h b/cpp/csp/engine/Feedback.h
index c8a128a5..be5e9b5f 100644
--- a/cpp/csp/engine/Feedback.h
+++ b/cpp/csp/engine/Feedback.h
@@ -12,7 +12,7 @@ template<typename T>
 class FeedbackInputAdapter;
 
 template<typename T>
-class CSP_PUBLIC FeedbackOutputAdapter final : public OutputAdapter
+class CSPIMPL_EXPORT FeedbackOutputAdapter final : public OutputAdapter
 {
 public:
     FeedbackOutputAdapter( csp::Engine * engine, 
@@ -29,7 +29,7 @@ class CSP_PUBLIC FeedbackOutputAdapter final : public OutputAdapter
 };
 
 template<typename T>
-class CSP_PUBLIC FeedbackInputAdapter final : public InputAdapter
+class CSPIMPL_EXPORT FeedbackInputAdapter final : public InputAdapter
 {
 public:
     using InputAdapter::InputAdapter;
diff --git a/cpp/csp/engine/GraphOutputAdapter.h b/cpp/csp/engine/GraphOutputAdapter.h
index 14e86936..7d21211d 100644
--- a/cpp/csp/engine/GraphOutputAdapter.h
+++ b/cpp/csp/engine/GraphOutputAdapter.h
@@ -15,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 CSP_PUBLIC GraphOutputAdapter : public OutputAdapter, public std::enable_shared_from_this<GraphOutputAdapter>
+class CSPIMPL_EXPORT 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 462000f2..357308ef 100644
--- a/cpp/csp/engine/InputAdapter.h
+++ b/cpp/csp/engine/InputAdapter.h
@@ -12,7 +12,7 @@ namespace csp
 
 class Consumer;
 
-class CSP_PUBLIC InputAdapter : public TimeSeriesProvider, public EngineOwned
+class CSPIMPL_EXPORT 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 73bbaadb..01e5c11f 100644
--- a/cpp/csp/engine/Node.h
+++ b/cpp/csp/engine/Node.h
@@ -25,7 +25,7 @@ struct NodeDef
     INOUT_ID_TYPE numOutputs;
 };
     
-class CSP_PUBLIC Node : public Consumer, public EngineOwned
+class CSPIMPL_EXPORT 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 53c993f1..d8debc83 100644
--- a/cpp/csp/engine/OutputAdapter.h
+++ b/cpp/csp/engine/OutputAdapter.h
@@ -10,7 +10,7 @@ namespace csp
 
 class TimeSeriesProvider;
 
-class CSP_PUBLIC OutputAdapter : public Consumer, public EngineOwned
+class CSPIMPL_EXPORT 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 95b43e43..4f7820e2 100644
--- a/cpp/csp/engine/PendingPushEvents.h
+++ b/cpp/csp/engine/PendingPushEvents.h
@@ -11,7 +11,7 @@ namespace csp
 struct PushGroup;
 class PushInputAdapters;
 
-class CSP_PUBLIC PendingPushEvents
+class CSPIMPL_EXPORT PendingPushEvents
 {
 public:
     PendingPushEvents();
diff --git a/cpp/csp/engine/Profiler.h b/cpp/csp/engine/Profiler.h
index 71044aba..d05bb43e 100644
--- a/cpp/csp/engine/Profiler.h
+++ b/cpp/csp/engine/Profiler.h
@@ -13,7 +13,7 @@
 namespace csp
 {
 
-class CSP_PUBLIC Profiler
+class CSPIMPL_EXPORT 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 455e21aa..bde322c5 100644
--- a/cpp/csp/engine/PullInputAdapter.h
+++ b/cpp/csp/engine/PullInputAdapter.h
@@ -10,7 +10,7 @@ namespace csp
 {
 
 template<typename T>
-class CSP_PUBLIC PullInputAdapter : public InputAdapter
+class CSPIMPL_EXPORT 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 6e75ce7e..56d7b22a 100644
--- a/cpp/csp/engine/PushEvent.h
+++ b/cpp/csp/engine/PushEvent.h
@@ -9,7 +9,7 @@ namespace csp
 
 class PushInputAdapter;
 
-struct CSP_PUBLIC PushEvent
+struct CSPIMPL_EXPORT PushEvent
 {
     PushEvent( PushInputAdapter *adapter ) : m_adapter( adapter ), next( nullptr )
     {}
diff --git a/cpp/csp/engine/PushInputAdapter.h b/cpp/csp/engine/PushInputAdapter.h
index d17233a1..4c049aab 100644
--- a/cpp/csp/engine/PushInputAdapter.h
+++ b/cpp/csp/engine/PushInputAdapter.h
@@ -76,7 +76,7 @@ class PushBatch : public SRMWLockFreeQueue<PushEvent>::Batch
     PushGroup * m_group; //used for assertion check
 };
 
-class CSP_PUBLIC PushInputAdapter : public InputAdapter
+class CSPIMPL_EXPORT 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 2f08da99..5e1dd574 100644
--- a/cpp/csp/engine/PushPullInputAdapter.h
+++ b/cpp/csp/engine/PushPullInputAdapter.h
@@ -10,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 CSP_PUBLIC PushPullInputAdapter : public PushInputAdapter
+class CSPIMPL_EXPORT 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 d8c10be7..ab8c3b6f 100644
--- a/cpp/csp/engine/RootEngine.h
+++ b/cpp/csp/engine/RootEngine.h
@@ -34,7 +34,7 @@ class EndCycleListener
     bool m_dirty = false;
 };
 
-class CSP_PUBLIC RootEngine : public Engine
+class CSPIMPL_EXPORT RootEngine : public Engine
 {
     using PushEventQueue  = SRMWLockFreeQueue<PushEvent>;
 
diff --git a/cpp/csp/engine/Scheduler.h b/cpp/csp/engine/Scheduler.h
index 438c489a..8a18352e 100644
--- a/cpp/csp/engine/Scheduler.h
+++ b/cpp/csp/engine/Scheduler.h
@@ -15,7 +15,7 @@ namespace csp
 
 class InputAdapter;
 
-class CSP_PUBLIC Scheduler
+class CSPIMPL_EXPORT Scheduler
 {
     struct Event;
 
diff --git a/cpp/csp/engine/StatusAdapter.h b/cpp/csp/engine/StatusAdapter.h
index aebacc3f..bedb765e 100644
--- a/cpp/csp/engine/StatusAdapter.h
+++ b/cpp/csp/engine/StatusAdapter.h
@@ -30,7 +30,7 @@ struct StatusLevelTraits
 
 using StatusLevel = csp::Enum<StatusLevelTraits>;
 
-class CSP_PUBLIC StatusAdapter : public PushInputAdapter
+class CSPIMPL_EXPORT 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 692ad842..cba21ab8 100644
--- a/cpp/csp/engine/Struct.h
+++ b/cpp/csp/engine/Struct.h
@@ -19,7 +19,7 @@ class TypedStructPtr;
 
 using StructPtr = TypedStructPtr<Struct>;
 
-class CSP_PUBLIC StructField
+class CSPIMPL_EXPORT StructField
 {
 public:
 
@@ -114,7 +114,7 @@ class CSP_PUBLIC StructField
 using StructFieldPtr = std::shared_ptr<StructField>;
 
 template<typename T>
-class CSP_PUBLIC NativeStructField : public StructField
+class CSPIMPL_EXPORT NativeStructField : public StructField
 {
     static_assert( CspType::Type::fromCType<T>::type <= CspType::Type::MAX_NATIVE_TYPE );
     static_assert( sizeof(T) == alignof(T) );
@@ -177,7 +177,7 @@ using TimeDeltaStructField = NativeStructField<TimeDelta>;
 using DateStructField      = NativeStructField<Date>;
 using TimeStructField      = NativeStructField<Time>;
 
-class CSP_PUBLIC CspEnumStructField final : public NativeStructField<CspEnum>
+class CSPIMPL_EXPORT CspEnumStructField final : public NativeStructField<CspEnum>
 {
 public:
     CspEnumStructField( CspTypePtr type, const std::string & fieldname ) : NativeStructField( type, fieldname )
@@ -185,7 +185,7 @@ class CSP_PUBLIC CspEnumStructField final : public NativeStructField<CspEnum>
 };
 
 template<typename T>
-class CSP_PUBLIC NotImplementedStructField : public StructField
+class CSPIMPL_EXPORT NotImplementedStructField : public StructField
 {
 public:
     const T & value( const Struct * s ) const
@@ -216,7 +216,7 @@ class CSP_PUBLIC NotImplementedStructField : public StructField
 
 
 //Non-native fields need to have these specialized in dialect-specific code
-class CSP_PUBLIC NonNativeStructField : public StructField
+class CSPIMPL_EXPORT NonNativeStructField : public StructField
 {
 public:
     NonNativeStructField( CspTypePtr type, const std::string &fieldname, size_t size, size_t alignment ) :
@@ -240,7 +240,7 @@ class CSP_PUBLIC NonNativeStructField : public StructField
     virtual void clearValueImpl( Struct * s ) const = 0;
 };
 
-class CSP_PUBLIC StringStructField final : public NonNativeStructField
+class CSPIMPL_EXPORT StringStructField final : public NonNativeStructField
 {
 public:
     using CType = csp::CspType::StringCType;
@@ -310,7 +310,7 @@ class CSP_PUBLIC StringStructField final : public NonNativeStructField
 };
 
 template<typename CType>
-class CSP_PUBLIC ArrayStructField : public NonNativeStructField
+class CSPIMPL_EXPORT ArrayStructField : public NonNativeStructField
 {
     using ElemT = typename CType::value_type;
 
@@ -419,7 +419,7 @@ class CSP_PUBLIC ArrayStructField : public NonNativeStructField
     }
 };
 
-class CSP_PUBLIC DialectGenericStructField : public NonNativeStructField
+class CSPIMPL_EXPORT DialectGenericStructField : public NonNativeStructField
 {
 public:
     DialectGenericStructField( const std::string & fieldname, size_t size, size_t alignment ) :
@@ -479,7 +479,7 @@ class CSP_PUBLIC DialectGenericStructField : public NonNativeStructField
 };
 
 template<typename T>
-class CSP_PUBLIC TypedStructPtr
+class CSPIMPL_EXPORT TypedStructPtr
 {
 public:
     TypedStructPtr() : m_obj( nullptr ) {}
@@ -581,7 +581,7 @@ TypedStructPtr<T> structptr_cast( const TypedStructPtr<U> & r )
     return out;
 }
 
-class CSP_PUBLIC StructMeta : public std::enable_shared_from_this<StructMeta>
+class CSPIMPL_EXPORT StructMeta : public std::enable_shared_from_this<StructMeta>
 {
 public:
     using Fields = std::vector<StructFieldPtr>;
@@ -685,7 +685,7 @@ std::shared_ptr<typename StructField::upcast<T>::type> StructMeta::getMetaField(
 
 using StructMetaPtr = std::shared_ptr<StructMeta>;
 
-class CSP_PUBLIC Struct
+class CSPIMPL_EXPORT Struct
 {
 public:
 
@@ -817,7 +817,7 @@ bool TypedStructPtr<T>::operator==( const TypedStructPtr<T> & rhs ) const
 }
 
 //field that is another struct
-class CSP_PUBLIC StructStructField final : public NonNativeStructField
+class CSPIMPL_EXPORT 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 4dbcf52d..90be0398 100644
--- a/cpp/csp/engine/TickBuffer.h
+++ b/cpp/csp/engine/TickBuffer.h
@@ -17,7 +17,7 @@ namespace csp
 {
 
 template< typename T >
-class CSP_PUBLIC TickBuffer
+class CSPIMPL_EXPORT TickBuffer
 {
 public:
     TickBuffer( uint32_t capacity = 1 );
diff --git a/cpp/csp/engine/TimeSeries.h b/cpp/csp/engine/TimeSeries.h
index bad9b282..26b78571 100644
--- a/cpp/csp/engine/TimeSeries.h
+++ b/cpp/csp/engine/TimeSeries.h
@@ -11,7 +11,7 @@ namespace csp
 {
 
 template<typename T>
-class CSP_PUBLIC TickBufferAccess
+class CSPIMPL_EXPORT TickBufferAccess
 {
 public:
     TickBufferAccess() : m_buffer( nullptr ), m_lastValue() { }
@@ -56,7 +56,7 @@ class CSP_PUBLIC TickBufferAccess
     T m_lastValue;
 };
 
-class CSP_PUBLIC TimeSeries
+class CSPIMPL_EXPORT TimeSeries
 {
 public:
     // Should match the DuplicatePolicy enum in python!!!
@@ -144,7 +144,7 @@ class CSP_PUBLIC TimeSeries
 };
 
 template< typename T >
-class CSP_PUBLIC TimeSeriesTyped : public TimeSeries
+class CSPIMPL_EXPORT TimeSeriesTyped : public TimeSeries
 {
 public:
     TimeSeriesTyped() : m_dataline()
diff --git a/cpp/csp/engine/TimeSeriesProvider.h b/cpp/csp/engine/TimeSeriesProvider.h
index 303be7e0..27cd1e82 100644
--- a/cpp/csp/engine/TimeSeriesProvider.h
+++ b/cpp/csp/engine/TimeSeriesProvider.h
@@ -14,7 +14,7 @@ class Consumer;
 class Node;
 
 //Holder of a single timeseries buffer and all associated links to consumers
-class CSP_PUBLIC TimeSeriesProvider
+class CSPIMPL_EXPORT TimeSeriesProvider
 {
 public:
     using DuplicatePolicyEnum = TimeSeries::DuplicatePolicyEnum;
diff --git a/cpp/csp/engine/TimerInputAdapter.h b/cpp/csp/engine/TimerInputAdapter.h
index b4cd00ef..86ab06b5 100644
--- a/cpp/csp/engine/TimerInputAdapter.h
+++ b/cpp/csp/engine/TimerInputAdapter.h
@@ -8,7 +8,7 @@ namespace csp
 {
 
 template<typename T>
-class CSP_PUBLIC TimerInputAdapter : public PullInputAdapter<T>
+class CSPIMPL_EXPORT 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 28009302..f629c280 100644
--- a/cpp/csp/engine/VectorContainer.h
+++ b/cpp/csp/engine/VectorContainer.h
@@ -6,7 +6,7 @@
 
 namespace csp
 {
-class CSP_PUBLIC VectorContainer
+class CSPIMPL_EXPORT VectorContainer
 {
 public:
     VectorContainer(const VectorContainer&) = delete;
diff --git a/cpp/csp/engine/WindowBuffer.h b/cpp/csp/engine/WindowBuffer.h
index b7e10acd..860a26cc 100644
--- a/cpp/csp/engine/WindowBuffer.h
+++ b/cpp/csp/engine/WindowBuffer.h
@@ -16,7 +16,7 @@ namespace csp
 // Class declarations
 
 template<typename T>
-class CSP_PUBLIC WindowBuffer
+class CSPIMPL_EXPORT WindowBuffer
 {
 public:
     WindowBuffer();
diff --git a/cpp/csp/python/Common.h b/cpp/csp/python/Common.h
index 8d3c2a12..0521229c 100644
--- a/cpp/csp/python/Common.h
+++ b/cpp/csp/python/Common.h
@@ -11,7 +11,7 @@
 namespace csp::python
 {
 
-class CSP_PUBLIC AcquireGIL
+class CSPIMPL_EXPORT AcquireGIL
 {
 public:
     AcquireGIL()  { m_state = PyGILState_Ensure(); }
@@ -21,7 +21,7 @@ class CSP_PUBLIC AcquireGIL
     PyGILState_STATE m_state;
 };
 
-class CSP_PUBLIC ReleaseGIL
+class CSPIMPL_EXPORT ReleaseGIL
 {
 public:
     ReleaseGIL()  { m_saveState = PyEval_SaveThread(); }
diff --git a/cpp/csp/python/Exception.h b/cpp/csp/python/Exception.h
index 6040c79a..3536eaf4 100644
--- a/cpp/csp/python/Exception.h
+++ b/cpp/csp/python/Exception.h
@@ -8,7 +8,7 @@
 namespace csp::python
 {
 
-class CSP_PUBLIC PythonPassthrough : public csp::Exception
+class CSPIMPL_EXPORT PythonPassthrough : public csp::Exception
 {
 public:
     PythonPassthrough( const char * exType, const std::string &r, const char * file,
diff --git a/cpp/csp/python/InitHelper.h b/cpp/csp/python/InitHelper.h
index 1665f847..3ffb20a8 100644
--- a/cpp/csp/python/InitHelper.h
+++ b/cpp/csp/python/InitHelper.h
@@ -125,7 +125,7 @@ inline bool InitHelper::execute( PyObject * module )
 #undef PyMODINIT_FUNC
 #endif
 
-#define PyMODINIT_FUNC extern "C" CSP_PUBLIC PyObject*
+#define PyMODINIT_FUNC extern "C" CSPIMPL_EXPORT PyObject*
 #endif
 
 #endif
diff --git a/cpp/csp/python/NumpyInputAdapter.h b/cpp/csp/python/NumpyInputAdapter.h
index c3632328..3552e502 100644
--- a/cpp/csp/python/NumpyInputAdapter.h
+++ b/cpp/csp/python/NumpyInputAdapter.h
@@ -12,7 +12,7 @@
 namespace csp::python
 {
 
-class CSP_PUBLIC NumpyCurveAccessor
+class CSPIMPL_EXPORT 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 9469fd86..a5c6cb3e 100644
--- a/cpp/csp/python/PyAdapterManager.h
+++ b/cpp/csp/python/PyAdapterManager.h
@@ -9,7 +9,7 @@ namespace csp { class AdapterManager; }
 namespace csp::python
 {
 
-struct CSP_PUBLIC PyAdapterManager_PyObject
+struct CSPIMPL_EXPORT PyAdapterManager_PyObject
 {
     PyObject_HEAD
     csp::AdapterManager * manager;
diff --git a/cpp/csp/python/PyBasketInputProxy.h b/cpp/csp/python/PyBasketInputProxy.h
index bd70c9f5..2dec0acf 100644
--- a/cpp/csp/python/PyBasketInputProxy.h
+++ b/cpp/csp/python/PyBasketInputProxy.h
@@ -15,7 +15,7 @@ class PyInputProxy;
 using PyInputProxyPtr = PyPtr<PyInputProxy>; 
 class PyNode;
 
-class CSP_PUBLIC PyBaseBasketInputProxy : public PyObject
+class CSPIMPL_EXPORT PyBaseBasketInputProxy : public PyObject
 {
 public:
     PyBaseBasketInputProxy( PyNode * node, INOUT_ID_TYPE id );
@@ -38,7 +38,7 @@ class CSP_PUBLIC PyBaseBasketInputProxy : public PyObject
 };
 
 
-class CSP_PUBLIC PyListBasketInputProxy final: public PyBaseBasketInputProxy
+class CSPIMPL_EXPORT PyListBasketInputProxy final: public PyBaseBasketInputProxy
 {
 public:
     PyListBasketInputProxy( PyNode * node, INOUT_ID_TYPE id, size_t shape );
@@ -63,7 +63,7 @@ class CSP_PUBLIC PyListBasketInputProxy final: public PyBaseBasketInputProxy
 };
 
 
-class CSP_PUBLIC PyDictBasketInputProxy : public PyBaseBasketInputProxy
+class CSPIMPL_EXPORT PyDictBasketInputProxy : public PyBaseBasketInputProxy
 {
 public:
     PyDictBasketInputProxy( PyNode * node, INOUT_ID_TYPE id, PyObject * shape );
@@ -86,7 +86,7 @@ class CSP_PUBLIC PyDictBasketInputProxy : public PyBaseBasketInputProxy
     PyObjectPtr m_proxyMapping;
 };
 
-class CSP_PUBLIC PyDynamicBasketInputProxy final : public PyDictBasketInputProxy
+class CSPIMPL_EXPORT 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 b390f4fb..046b8b56 100644
--- a/cpp/csp/python/PyBasketOutputProxy.h
+++ b/cpp/csp/python/PyBasketOutputProxy.h
@@ -13,7 +13,7 @@ class PyOutputProxy;
 using PyOutputProxyPtr = PyPtr<PyOutputProxy>;
 class PyNode;
 
-class CSP_PUBLIC PyBaseBasketOutputProxy : public PyObject
+class CSPIMPL_EXPORT PyBaseBasketOutputProxy : public PyObject
 {
 public:
     PyBaseBasketOutputProxy( Node * node, INOUT_ID_TYPE id );
@@ -23,7 +23,7 @@ class CSP_PUBLIC PyBaseBasketOutputProxy : public PyObject
     INOUT_ID_TYPE                 m_id;
 };
 
-class CSP_PUBLIC PyListBasketOutputProxy final : public PyBaseBasketOutputProxy
+class CSPIMPL_EXPORT PyListBasketOutputProxy final : public PyBaseBasketOutputProxy
 {
 public:
     PyListBasketOutputProxy( PyObject *pyType, Node * node, INOUT_ID_TYPE id, size_t shape );
@@ -44,7 +44,7 @@ class CSP_PUBLIC PyListBasketOutputProxy final : public PyBaseBasketOutputProxy
     std::vector<PyOutputProxyPtr> m_proxies;
 };
 
-class CSP_PUBLIC PyDictBasketOutputProxy : public PyBaseBasketOutputProxy
+class CSPIMPL_EXPORT PyDictBasketOutputProxy : public PyBaseBasketOutputProxy
 {
 public:
     PyDictBasketOutputProxy( PyObject *pyType, Node * node, INOUT_ID_TYPE id, PyObject * shape );
@@ -59,7 +59,7 @@ class CSP_PUBLIC PyDictBasketOutputProxy : public PyBaseBasketOutputProxy
     PyObjectPtr m_proxyMapping;
 };
 
-class CSP_PUBLIC PyDynamicBasketOutputProxy final : public PyDictBasketOutputProxy
+class CSPIMPL_EXPORT PyDynamicBasketOutputProxy final : public PyDictBasketOutputProxy
 {
 public:
     PyDynamicBasketOutputProxy( PyObject *pyType, Node * node, INOUT_ID_TYPE id, PyObject * shape );
diff --git a/cpp/csp/python/PyCspEnum.h b/cpp/csp/python/PyCspEnum.h
index fb098735..66aaa4ee 100644
--- a/cpp/csp/python/PyCspEnum.h
+++ b/cpp/csp/python/PyCspEnum.h
@@ -27,7 +27,7 @@ struct CSPTYPESIMPL_EXPORT PyCspEnumMeta : public PyHeapTypeObject
     static PyTypeObject PyType;
 };
 
-//TODO Windows - need to figure out why adding CSP_PUBLIC to this class leads to weird compilation errors on CspEnumMeta's unordered_map...
+//TODO Windows - need to figure out why adding CSPIMPL_EXPORT to this class leads to weird compilation errors on CspEnumMeta's unordered_map...
 
 //This is an extension of csp::CspEnumMeta for python dialect, we need it in order to 
 //keep a reference to the python enum type from conversion to/from csp::CspEnumMeta <-> PyObject properly
diff --git a/cpp/csp/python/PyEngine.h b/cpp/csp/python/PyEngine.h
index 53589f44..8602651a 100644
--- a/cpp/csp/python/PyEngine.h
+++ b/cpp/csp/python/PyEngine.h
@@ -17,7 +17,7 @@ namespace csp::python
 class PyEngine;
 
 //This is the actual python root engine
-class CSP_PUBLIC PythonEngine final : public csp::RootEngine
+class CSPIMPL_EXPORT 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 7eeb0fac..8b0c7ae0 100644
--- a/cpp/csp/python/PyGraphOutputAdapter.h
+++ b/cpp/csp/python/PyGraphOutputAdapter.h
@@ -8,7 +8,7 @@
 namespace csp::python
 {
 
-class CSP_PUBLIC PyGraphOutputAdapter : public GraphOutputAdapter
+class CSPIMPL_EXPORT PyGraphOutputAdapter : public GraphOutputAdapter
 {
 public:
     using GraphOutputAdapter::GraphOutputAdapter;
diff --git a/cpp/csp/python/PyInputProxy.h b/cpp/csp/python/PyInputProxy.h
index 850c0e7b..2f3e5de7 100644
--- a/cpp/csp/python/PyInputProxy.h
+++ b/cpp/csp/python/PyInputProxy.h
@@ -12,7 +12,7 @@ namespace csp::python
 
 class PyNode;
 
-class CSP_PUBLIC PyInputProxy : public PyObject
+class CSPIMPL_EXPORT PyInputProxy : public PyObject
 {
 public:
     PyInputProxy( PyNode * node, InputId id );
diff --git a/cpp/csp/python/PyNode.h b/cpp/csp/python/PyNode.h
index 579896d1..c5a4a213 100644
--- a/cpp/csp/python/PyNode.h
+++ b/cpp/csp/python/PyNode.h
@@ -12,7 +12,7 @@ namespace csp::python
 
 class PyEngine;
 
-class CSP_PUBLIC PyNode final: public csp::Node
+class CSPIMPL_EXPORT 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 6e3ebe5f..e98bc634 100644
--- a/cpp/csp/python/PyNodeWrapper.h
+++ b/cpp/csp/python/PyNodeWrapper.h
@@ -9,7 +9,7 @@ namespace csp::python
 {
 
 //simple wrapper for python level access when wiring
-class CSP_PUBLIC PyNodeWrapper : public PyObject
+class CSPIMPL_EXPORT PyNodeWrapper : public PyObject
 {
 public:
     csp::Node * node() { return m_node; }
diff --git a/cpp/csp/python/PyNumbaNode.h b/cpp/csp/python/PyNumbaNode.h
index f9fe1f34..4dffe7c2 100644
--- a/cpp/csp/python/PyNumbaNode.h
+++ b/cpp/csp/python/PyNumbaNode.h
@@ -13,7 +13,7 @@ class PyEngine;
 
 typedef void (*CallbackType)(void *node, void *state);
 
-class CSP_PUBLIC PyNumbaNode final : public csp::Node
+class CSPIMPL_EXPORT 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 a5c3ea75..f351a61d 100644
--- a/cpp/csp/python/PyOutputProxy.h
+++ b/cpp/csp/python/PyOutputProxy.h
@@ -9,7 +9,7 @@
 namespace csp::python
 {
 
-class CSP_PUBLIC PyOutputProxy final: public PyObject
+class CSPIMPL_EXPORT 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 525bfa3d..748a9c05 100644
--- a/cpp/csp/python/PyPushInputAdapter.h
+++ b/cpp/csp/python/PyPushInputAdapter.h
@@ -8,7 +8,7 @@ namespace csp::python
 {
 
 //PushBatch
-struct CSP_PUBLIC PyPushBatch
+struct CSPIMPL_EXPORT PyPushBatch
 {
     PyObject_HEAD
     PushBatch batch;
diff --git a/cpp/csp/python/PyStructFastList.h b/cpp/csp/python/PyStructFastList.h
index 39da2075..e10ec2be 100644
--- a/cpp/csp/python/PyStructFastList.h
+++ b/cpp/csp/python/PyStructFastList.h
@@ -14,7 +14,7 @@ namespace csp::python
 {
 
 template<typename StorageT>
-struct CSP_PUBLIC PyStructFastList : public PyObject
+struct CSPIMPL_EXPORT 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 136570fe..e5c40745 100644
--- a/cpp/csp/python/PyStructList.h
+++ b/cpp/csp/python/PyStructList.h
@@ -12,7 +12,7 @@ namespace csp::python
 {
 
 template<typename StorageT>
-struct CSP_PUBLIC PyStructList : public PyObject
+struct CSPIMPL_EXPORT PyStructList : public PyObject
 {
     using ElemT = typename CspType::Type::toCArrayElemType<StorageT>::type;
 
diff --git a/csp/build/csp_autogen.py b/csp/build/csp_autogen.py
index 71b570dd..b85ecf75 100644
--- a/csp/build/csp_autogen.py
+++ b/csp/build/csp_autogen.py
@@ -152,7 +152,7 @@ def _generate_enum_class(self, enum_type):
         cspenum_decls = "\n".join(f"    static {enum_name} {x.name};" for x in enum_type)
 
         out = f"""
-class CSP_PUBLIC {enum_name} : public csp::CspEnum
+class CSPIMPL_EXPORT {enum_name} : public csp::CspEnum
 {{
 public:
     // Raw value quick access
@@ -315,7 +315,7 @@ def _generate_struct_class(self, struct_type):
             )
 
         out = f"""
-class CSP_PUBLIC {struct_name} : public {base_class}
+class CSPIMPL_EXPORT {struct_name} : public {base_class}
 {{
 public: