diff --git a/include/blosc2.h b/include/blosc2.h
index 51df1c4a..4c0139e9 100644
--- a/include/blosc2.h
+++ b/include/blosc2.h
@@ -108,12 +108,12 @@ extern "C" {
     do {                                            \
         if ((pointer) == NULL) {                    \
             BLOSC_TRACE_ERROR("Pointer is null");   \
-            return rc;                              \
+            return (rc);                            \
         }                                           \
     } while (0)
 #define BLOSC_ERROR(rc)                             \
     do {                                            \
-        int rc_ = rc;                               \
+        int rc_ = (rc);                             \
         if (rc_ < BLOSC2_ERROR_SUCCESS) {           \
             char *error_msg = print_error(rc_);     \
             BLOSC_TRACE_ERROR("%s", error_msg);     \
diff --git a/include/blosc2/codecs-registry.h b/include/blosc2/codecs-registry.h
index a2ff8bb7..e33df531 100644
--- a/include/blosc2/codecs-registry.h
+++ b/include/blosc2/codecs-registry.h
@@ -11,8 +11,6 @@
 #ifndef BLOSC_BLOSC2_CODECS_REGISTRY_H
 #define BLOSC_BLOSC2_CODECS_REGISTRY_H
 
-#include "blosc2.h"
-
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -45,9 +43,6 @@ typedef struct {
     char *decoder;
 } codec_info;
 
-// Silence unused codec_info typedef warning
-static codec_info codec_info_defaults BLOSC_ATTRIBUTE_UNUSED = {0};
-
 #ifdef __cplusplus
 }
 #endif