diff --git a/m-array.h b/m-array.h
index 578a2bfe..d7b1e4fd 100644
--- a/m-array.h
+++ b/m-array.h
@@ -61,6 +61,7 @@
    ,SWAP(M_C(name, _swap))						\
    ,TYPE(M_C(name,_t))							\
    ,SUBTYPE(M_C(name, _type_t))						\
+   ,TEST_EMPTY(M_C(name,_empty_p))                                      \
    ,IT_TYPE(M_C(name,_it_t))						\
    ,IT_FIRST(M_C(name,_it))						\
    ,IT_LAST(M_C(name,_it_last))						\
diff --git a/m-bitset.h b/m-bitset.h
index b9bf0a61..62806d42 100644
--- a/m-bitset.h
+++ b/m-bitset.h
@@ -688,6 +688,7 @@ bitset_clz(const bitset_t set)
    ,SWAP(bitset_swap)                                                   \
    ,TYPE(bitset_t)                                                      \
    ,SUBTYPE(bool)                                                       \
+   ,TEST_EMPTY(bitset_empty_p),                                         \
    ,IT_TYPE(bitset_it_t)                                                \
    ,IT_FIRST(bitset_it)                                                 \
    ,IT_SET(bitset_it_set)                                               \
diff --git a/m-bptree.h b/m-bptree.h
index c6b3debe..16342f89 100644
--- a/m-bptree.h
+++ b/m-bptree.h
@@ -68,6 +68,7 @@
    SWAP(M_C(name, _swap)),						\
    TYPE(M_C(name,_t)),							\
    SUBTYPE(M_C(name, _type_t)),						\
+   TEST_EMPTY(M_C(name,_empty_p)),                                      \
    IT_TYPE(M_C(name, _it_t)),						\
    IT_FIRST(M_C(name,_it)),						\
    IT_SET(M_C(name,_it_set)),						\
diff --git a/m-deque.h b/m-deque.h
index 810ab178..d861e17a 100644
--- a/m-deque.h
+++ b/m-deque.h
@@ -874,6 +874,7 @@
    ,SWAP(M_C(name, _swap))						\
    ,TYPE(M_C(name,_t))							\
    ,SUBTYPE(M_C(name, _type_t))						\
+   ,TEST_EMPTY(M_C(name,_empty_p))                                      \
    ,IT_TYPE(M_C(name,_it_t))						\
    ,IT_FIRST(M_C(name,_it))						\
    ,IT_LAST(M_C(name,_it_last))						\
diff --git a/m-dict.h b/m-dict.h
index bd236d0a..61cf37fb 100644
--- a/m-dict.h
+++ b/m-dict.h
@@ -795,6 +795,7 @@
    CLEAN(M_C(name, _clean)),                                            \
    TYPE(M_C(name, _t)),							\
    SUBTYPE(struct M_C(name, _pair_s)),                                  \
+   TEST_EMPTY(M_C(name,_empty_p)),                                      \
    IT_TYPE(M_C(name, _it_t)),						\
    IT_FIRST(M_C(name,_it)),						\
    IT_SET(M_C(name, _it_set)),						\
@@ -835,6 +836,7 @@
    CLEAN(M_C(name, _clean)),                                            \
    TYPE(M_C(name, _t)),							\
    SUBTYPE(struct M_C(name, _pair_s)),                                  \
+   TEST_EMPTY(M_C(name,_empty_p)),                                      \
    PUSH(M_C(name,_push)),						\
    IT_TYPE(M_C(name, _it_t)),						\
    IT_FIRST(M_C(name,_it)),						\
diff --git a/m-i-list.h b/m-i-list.h
index 16ea2b91..42369a0f 100644
--- a/m-i-list.h
+++ b/m-i-list.h
@@ -79,6 +79,7 @@ typedef struct ilist_head_s {
    TYPE(M_C(name,_t)),							\
    CLEAN(M_C(name,_clean)),                                             \
    SUBTYPE(M_C(name,_type_t)),						\
+   TEST_EMPTY(M_C(name,_empty_p)),                                      \
    IT_TYPE(M_C(name,_it_t)),						\
    IT_FIRST(M_C(name,_it)),						\
    IT_SET(M_C(name,_it_set)),						\
diff --git a/m-list.h b/m-list.h
index 3953ae1e..106914d3 100644
--- a/m-list.h
+++ b/m-list.h
@@ -64,6 +64,7 @@
    SWAP(M_C(name, _swap)),						\
    TYPE(M_C(name,_t)),							\
    SUBTYPE(M_C(name, _type_t)),						\
+   TEST_EMPTY(M_C(name,_empty_p)),                                      \
    IT_TYPE(M_C(name, _it_t)),						\
    IT_FIRST(M_C(name,_it)),						\
    IT_END(M_C(name,_it_end)),						\
diff --git a/m-rbtree.h b/m-rbtree.h
index 0a661983..a8b10855 100644
--- a/m-rbtree.h
+++ b/m-rbtree.h
@@ -60,6 +60,7 @@
    SWAP(M_C(name, _swap)),						\
    TYPE(M_C(name,_t)),							\
    SUBTYPE(M_C(name, _type_t)),						\
+   TEST_EMPTY(M_C(name,_empty_p)),                                      \
    IT_TYPE(M_C(name, _it_t)),						\
    IT_FIRST(M_C(name,_it)),						\
    IT_SET(M_C(name,_it_set)),						\
diff --git a/m-string.h b/m-string.h
index bec7448a..e3544a36 100644
--- a/m-string.h
+++ b/m-string.h
@@ -1274,6 +1274,7 @@ namespace m_string {
    INIT_WITH(STRING_INIT_PRINTF),                                       \
    INIT_MOVE(string_init_move), MOVE(string_move),                      \
    SWAP(string_swap), CLEAN(string_clean),                              \
+   TEST_EMPTY(string_empty_p),                                          \
    CLEAR(string_clear), HASH(string_hash), EQUAL(string_equal_p),       \
    CMP(string_cmp), TYPE(string_t),                                     \
    PARSE_STR(string_parse_str), GET_STR(string_get_str),                \
diff --git a/m-variant.h b/m-variant.h
index 6af556bb..bebdc5ed 100644
--- a/m-variant.h
+++ b/m-variant.h
@@ -511,6 +511,7 @@
    CLEAR(M_C(name, _clear)),                                            \
    CLEAN(M_C(name, _clean)),                                            \
    TYPE(M_C(name,_t)),                                                  \
+   TEST_EMPTY(M_C(name,_empty_p)),                                      \
    M_IF_METHOD_ALL(HASH, __VA_ARGS__)(HASH(M_C(name, _hash)),),         \
    M_IF_METHOD_ALL(EQUAL, __VA_ARGS__)(EQUAL(M_C(name, _equal_p)),),    \
    M_IF_METHOD_ALL(GET_STR, __VA_ARGS__)(GET_STR(M_C(name, _get_str)),), \