diff --git a/hidapi/hidapi.h b/hidapi/hidapi.h
index ac78cb278..90cae4524 100644
--- a/hidapi/hidapi.h
+++ b/hidapi/hidapi.h
@@ -29,18 +29,17 @@
 
 #include <wchar.h>
 
+/* #480: this is to be refactored properly for v1.0 */
 #ifdef _WIN32
-   /* #480: this is to be refactored properly for v1.0 */
-   #ifndef HID_API_EXPORT
+   #ifndef HID_API_NO_EXPORT_DEFINE
       #define HID_API_EXPORT __declspec(dllexport)
    #endif
-      #define HID_API_CALL
-#else
-   #ifndef HID_API_EXPORT
-      #define HID_API_EXPORT /**< API export macro */
-   #endif
-      #define HID_API_CALL /**< API call macro */
 #endif
+#ifndef HID_API_EXPORT
+   #define HID_API_EXPORT /**< API export macro */
+#endif
+/* To be removed in v1.0 */
+#define HID_API_CALL /**< API call macro */
 
 #define HID_API_EXPORT_CALL HID_API_EXPORT HID_API_CALL /**< API export and call macro*/
 
diff --git a/windows/CMakeLists.txt b/windows/CMakeLists.txt
index d32959c22..c8228bc84 100644
--- a/windows/CMakeLists.txt
+++ b/windows/CMakeLists.txt
@@ -26,7 +26,7 @@ if(NOT BUILD_SHARED_LIBS)
     target_compile_definitions(hidapi_winapi
         # prevent marking functions as __declspec(dllexport) for static library build
         # #480: this should be refactored for v1.0
-        PUBLIC HID_API_EXPORT
+        PUBLIC HID_API_NO_EXPORT_DEFINE
     )
 endif()