diff --git a/Include/cinder/ci_api.h b/Include/cinder/ci_api.h
index 8dcf48c56a7..3dc20fc5199 100644
--- a/Include/cinder/ci_api.h
+++ b/Include/cinder/ci_api.h
@@ -10,25 +10,27 @@
  * prerequisites for CinderX being compatible with non-Cinder Python.
  */
 
+#include "exports.h"
+
 // These function the same as PyAPI_* - exporting symbols for use in .so's etc.
-#define CiAPI_FUNC(RTYPE) __attribute__ ((visibility ("default"))) RTYPE
+#define CiAPI_FUNC(RTYPE) Py_EXPORTED_SYMBOL RTYPE
 #ifdef __clang__
 #  ifdef __cplusplus
-#    define CiAPI_DATA(RTYPE) __attribute__ ((visibility ("default"))) extern "C" RTYPE
+#    define CiAPI_DATA(RTYPE) Py_EXPORTED_SYMBOL extern "C" RTYPE
 #  else
-#    define CiAPI_DATA(RTYPE) __attribute__ ((visibility ("default"))) extern RTYPE
+#    define CiAPI_DATA(RTYPE) Py_EXPORTED_SYMBOL extern RTYPE
 #  endif
 #else
 #  ifdef __cplusplus
-#    define CiAPI_DATA(RTYPE) extern "C" __attribute__ ((visibility ("default")))RTYPE
+#    define CiAPI_DATA(RTYPE) extern "C" Py_EXPORTED_SYMBOL RTYPE
 #  else
-#    define CiAPI_DATA(RTYPE) extern __attribute__ ((visibility ("default"))) RTYPE
+#    define CiAPI_DATA(RTYPE) extern Py_EXPORTED_SYMBOL RTYPE
 #  endif
 #endif
 
 // Clang seems to (always?) make symbols for static inline functions.
 #ifdef __clang__
-#  define CiAPI_STATIC_INLINE_FUNC(RTYPE) static inline __attribute__ ((visibility ("default"))) RTYPE
+#  define CiAPI_STATIC_INLINE_FUNC(RTYPE) static inline Py_EXPORTED_SYMBOL RTYPE
 #else
 #  define CiAPI_STATIC_INLINE_FUNC(RTYPE) static inline RTYPE
 #endif
diff --git a/PCbuild/_freeze_module.vcxproj b/PCbuild/_freeze_module.vcxproj
index bfacf154973..cfed92ca045 100644
--- a/PCbuild/_freeze_module.vcxproj
+++ b/PCbuild/_freeze_module.vcxproj
@@ -186,6 +186,7 @@
     <ClCompile Include="..\Python\bltinmodule.c" />
     <ClCompile Include="..\Python\bootstrap_hash.c" />
     <ClCompile Include="..\Python\ceval.c" />
+    <ClCompile Include="..\Python\cinderhooks.c" />
     <ClCompile Include="..\Python\codecs.c" />
     <ClCompile Include="..\Python\compile.c" />
     <ClCompile Include="..\Python\context.c" />
diff --git a/PCbuild/_freeze_module.vcxproj.filters b/PCbuild/_freeze_module.vcxproj.filters
index 7b200e3dcda..f9712cac051 100644
--- a/PCbuild/_freeze_module.vcxproj.filters
+++ b/PCbuild/_freeze_module.vcxproj.filters
@@ -79,6 +79,9 @@
     <ClCompile Include="..\Python\ceval.c">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\Python\cinderhooks.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="..\Objects\classobject.c">
       <Filter>Source Files</Filter>
     </ClCompile>
diff --git a/PCbuild/pythoncore.vcxproj b/PCbuild/pythoncore.vcxproj
index 7e15b401dbb..eb78cb46950 100644
--- a/PCbuild/pythoncore.vcxproj
+++ b/PCbuild/pythoncore.vcxproj
@@ -133,6 +133,8 @@
     <ClInclude Include="..\Include\codecs.h" />
     <ClInclude Include="..\Include\compile.h" />
     <ClInclude Include="..\Include\complexobject.h" />
+    <ClInclude Include="..\Include\cinder\ci_api.h" />
+    <ClInclude Include="..\Include\cinder\hooks.h" />
     <ClInclude Include="..\Include\cpython\abstract.h" />
     <ClInclude Include="..\Include\cpython\bytearrayobject.h" />
     <ClInclude Include="..\Include\cpython\bytesobject.h" />
@@ -515,6 +517,7 @@
     <ClCompile Include="..\Python\bltinmodule.c" />
     <ClCompile Include="..\Python\bootstrap_hash.c" />
     <ClCompile Include="..\Python\ceval.c" />
+    <ClCompile Include="..\Python\cinderhooks.c" />
     <ClCompile Include="..\Python\codecs.c" />
     <ClCompile Include="..\Python\compile.c" />
     <ClCompile Include="..\Python\context.c" />
diff --git a/PCbuild/pythoncore.vcxproj.filters b/PCbuild/pythoncore.vcxproj.filters
index 76bcbafa17c..8ec98e98484 100644
--- a/PCbuild/pythoncore.vcxproj.filters
+++ b/PCbuild/pythoncore.vcxproj.filters
@@ -51,6 +51,12 @@
     <ClInclude Include="..\Include\bytesobject.h">
       <Filter>Include</Filter>
     </ClInclude>
+    <ClInclude Include="..\Include\cinder\ci_api.h">
+      <Filter>Include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Include\cinder\hooks.h">
+      <Filter>Include</Filter>
+    </ClInclude>
     <ClInclude Include="..\Include\ceval.h">
       <Filter>Include</Filter>
     </ClInclude>
@@ -1130,6 +1136,9 @@
     <ClCompile Include="..\Python\ceval.c">
       <Filter>Python</Filter>
     </ClCompile>
+    <ClCompile Include="..\Python\cinderhooks.c">
+      <Filter>Python</Filter>
+    </ClCompile>
     <ClCompile Include="..\Python\codecs.c">
       <Filter>Python</Filter>
     </ClCompile>