diff --git a/include/cn-cbor/cn-cbor.h b/include/cn-cbor/cn-cbor.h
index b251104..568b57c 100644
--- a/include/cn-cbor/cn-cbor.h
+++ b/include/cn-cbor/cn-cbor.h
@@ -9,11 +9,11 @@
 
 #ifndef MYLIB_EXPORT
 #if defined (_WIN32) 
-#if defined(cn_cbor_EXPORTS)
-#define  MYLIB_EXPORT __declspec(dllexport)
-#else
+#if defined(CN_CBOR_IS_DLL)
 #define  MYLIB_EXPORT __declspec(dllimport)
-#endif /* cn_cbor_EXPORTS */
+#else
+#define MYLIB_EXPORT
+#endif /* CN_CBOR_IS_DLL */
 #else /* defined (_WIN32) */
 #define MYLIB_EXPORT
 #endif 
diff --git a/src/dll-export.h b/src/dll-export.h
index 531c9e7..3d0c928 100644
--- a/src/dll-export.h
+++ b/src/dll-export.h
@@ -11,10 +11,10 @@
 // We are using the Visual Studio Compiler and building Shared libraries
 
 #if defined (_WIN32) 
-#if defined(cn_cbor_EXPORTS)
+#if defined(CN_CBOR_IS_DLL)
     #define  MYLIB_EXPORT __declspec(dllexport)
 #else
-    #define  MYLIB_EXPORT __declspec(dllimport)
+    #define MYLIB_EXPORT
 #endif /* cn_cbor_EXPORTS */
 #else /* defined (_WIN32) */
  #define MYLIB_EXPORT