diff --git a/include/vsg/core/Array.h b/include/vsg/core/Array.h
index 35ecabec7d..6fcc98fbe2 100644
--- a/include/vsg/core/Array.h
+++ b/include/vsg/core/Array.h
@@ -32,7 +32,7 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 namespace vsg
 {
     template<typename T>
-    class VSG_DECLSPEC Array : public Data
+    class VSG_TEMPLATE_DECLSPEC Array : public Data
     {
     public:
         using value_type = T;
diff --git a/include/vsg/core/Array2D.h b/include/vsg/core/Array2D.h
index 9868077d00..203a800828 100644
--- a/include/vsg/core/Array2D.h
+++ b/include/vsg/core/Array2D.h
@@ -30,7 +30,7 @@ namespace vsg
 {
 
     template<typename T>
-    class VSG_DECLSPEC Array2D : public Data
+    class VSG_TEMPLATE_DECLSPEC Array2D : public Data
     {
     public:
         using value_type = T;
diff --git a/include/vsg/core/Array3D.h b/include/vsg/core/Array3D.h
index ec4daa1405..1e1c26befa 100644
--- a/include/vsg/core/Array3D.h
+++ b/include/vsg/core/Array3D.h
@@ -30,7 +30,7 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 namespace vsg
 {
     template<typename T>
-    class VSG_DECLSPEC Array3D : public Data
+    class VSG_TEMPLATE_DECLSPEC Array3D : public Data
     {
     public:
         using value_type = T;
diff --git a/include/vsg/core/Export.h b/include/vsg/core/Export.h
index c5b5941f9d..1201f820e8 100644
--- a/include/vsg/core/Export.h
+++ b/include/vsg/core/Export.h
@@ -24,10 +24,13 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 #    else
 #        define VSG_DECLSPEC
 #    endif
+#    define VSG_TEMPLATE_DECLSPEC
 #else
 #    if defined(VSG_SHARED_LIBRARY) || defined(VSG_EXPORTS)
 #        define VSG_DECLSPEC __attribute__((visibility("default")))
+#        define VSG_TEMPLATE_DECLSPEC __attribute__((visibility("default")))
 #    else
 #        define VSG_DECLSPEC
+#        define VSG_TEMPLATE_DECLSPEC
 #    endif
 #endif
diff --git a/include/vsg/core/Value.h b/include/vsg/core/Value.h
index 82139ec2ff..0b60876db7 100644
--- a/include/vsg/core/Value.h
+++ b/include/vsg/core/Value.h
@@ -36,7 +36,7 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 namespace vsg
 {
     template<typename T>
-    class VSG_DECLSPEC Value : public Data
+    class VSG_TEMPLATE_DECLSPEC Value : public Data
     {
     public:
         using value_type = T;
diff --git a/include/vsg/vk/State.h b/include/vsg/vk/State.h
index 1f82b20e13..6f5ffcaadb 100644
--- a/include/vsg/vk/State.h
+++ b/include/vsg/vk/State.h
@@ -246,7 +246,7 @@ namespace vsg
     };
 
     /// vsg::State is used by vsg::RecordTraversal to manage state stacks, projection and modelview matrices and frustum stacks.
-    class State : public Inherit<Object, State>
+    class VSG_DECLSPEC State : public Inherit<Object, State>
     {
     public:
         explicit State(const Slots& in_maxSlots);