diff --git a/include/icsneo/icsneo.h b/include/icsneo/icsneo.h
index fefe83f..c0617a7 100644
--- a/include/icsneo/icsneo.h
+++ b/include/icsneo/icsneo.h
@@ -24,11 +24,15 @@ extern "C" {
     #pragma warning Unknown dynamic link import/export semantics.
 #endif
 
+#ifdef ICSNEO_BUILD_STATIC
+#define ICSNEO_API
+#else
 #ifdef ICSNEO_EXPORTS
 #define ICSNEO_API EXPORT
 #else
 #define ICSNEO_API IMPORT
-#endif
+#endif // ICSNEO_EXPORTS
+#endif // ICSNEO_BUILD_STATIC
 
 /** @brief icsneo_device_t opaque struct definition
  * 
diff --git a/include/icsneo/icsneotypes.h b/include/icsneo/icsneotypes.h
index 2a2e77d..f3508e8 100644
--- a/include/icsneo/icsneotypes.h
+++ b/include/icsneo/icsneotypes.h
@@ -160,7 +160,7 @@ typedef uint32_t icsneo_devicetype_t;
 
 // Make sure icsneo_devicetype_t is never smaller than the actual enum
 #if __STDC_VERSION__ < 202311L && !defined(__cplusplus)
-_Static_assert(sizeof(_icsneo_devicetype_t) <= sizeof(icsneo_devicetype_t));
+_Static_assert(sizeof(_icsneo_devicetype_t) <= sizeof(icsneo_devicetype_t), "icsneo_devicetype_t is too small");
 #else // C++ or C23
 static_assert(sizeof(_icsneo_devicetype_t) <= sizeof(icsneo_devicetype_t));
 #endif