Index: src/examples/gc_no_raii/src/internal/globals.h
===================================================================
--- src/examples/gc_no_raii/src/internal/globals.h	(revision 34b76a8f7e7cecb6ec388a5420403fc4bc109211)
+++ src/examples/gc_no_raii/src/internal/globals.h	(revision 1b5c81eda8ac4fbd0dbf2cdca2786bc4e7f9cd93)
@@ -16,14 +16,15 @@
 // static const size_t OBJECT_PTR_MASK = ~(OBJECT_ALLIGNMENT - 1);
 
+enum {
+	POOL_SIZE_EXP 	= 24,
+	POOL_SIZE_BYTES 	= 0x1 << POOL_SIZE_EXP,
+	POOL_PTR_MASK 	= ~(POOL_SIZE_BYTES - 1),
 
-#define POOL_SIZE_EXP 24
-#define POOL_SIZE_BYTES 0x1 << POOL_SIZE_EXP
-#define POOL_PTR_MASK ~(POOL_SIZE_BYTES - 1)
+	CARDS_SIZE_EXP 	= 12,
+	CARDS_SIZE_BYTES 	= 0x1 << CARDS_SIZE_EXP,
+	CARDS_OFFSET_MASK	= (~(CARDS_SIZE_BYTES - 1)) & (POOL_SIZE_BYTES - 1),
+	CARDS_COUNT 	= POOL_SIZE_BYTES / CARDS_SIZE_BYTES,
 
-#define CARDS_SIZE_EXP 12
-#define CARDS_SIZE_BYTES 0x1 << CARDS_SIZE_EXP
-#define CARDS_OFFSET_MASK (~(CARDS_SIZE_BYTES - 1)) & (POOL_SIZE_BYTES - 1)
-#define CARDS_COUNT POOL_SIZE_BYTES / CARDS_SIZE_BYTES
-
-#define OBJECT_ALLIGNMENT sizeof(size_t)
-#define OBJECT_PTR_MASK ~(OBJECT_ALLIGNMENT - 1)
+	OBJECT_ALLIGNMENT	= sizeof(size_t),
+	OBJECT_PTR_MASK 	= ~(OBJECT_ALLIGNMENT - 1),
+};
Index: src/examples/gc_no_raii/src/internal/object_header.h
===================================================================
--- src/examples/gc_no_raii/src/internal/object_header.h	(revision 34b76a8f7e7cecb6ec388a5420403fc4bc109211)
+++ src/examples/gc_no_raii/src/internal/object_header.h	(revision 1b5c81eda8ac4fbd0dbf2cdca2786bc4e7f9cd93)
@@ -1,4 +1,5 @@
 #pragma once
 
+#include <stdbool.h>
 #include <stddef.h>
 #include <stdint.h>
Index: src/examples/gc_no_raii/src/internal/state.c
===================================================================
--- src/examples/gc_no_raii/src/internal/state.c	(revision 34b76a8f7e7cecb6ec388a5420403fc4bc109211)
+++ src/examples/gc_no_raii/src/internal/state.c	(revision 1b5c81eda8ac4fbd0dbf2cdca2786bc4e7f9cd93)
@@ -26,7 +26,8 @@
 #endif
 
+static gc_state s;
+
 gc_state* gc_get_state()
 {
-	static gc_state s;
 	if(!s.is_initialized) ctor(&s);
 	return &s;
Index: src/examples/gc_no_raii/src/vector.c
===================================================================
--- src/examples/gc_no_raii/src/vector.c	(revision 34b76a8f7e7cecb6ec388a5420403fc4bc109211)
+++ src/examples/gc_no_raii/src/vector.c	(revision 1b5c81eda8ac4fbd0dbf2cdca2786bc4e7f9cd93)
@@ -64,5 +64,5 @@
 inline void realloc(heap_allocator(T) *const this, size_t size)
 {
-	static const size_t GROWTH_RATE = 2;
+	enum { GROWTH_RATE = 2 };
 	if(size > this->capacity)
 	{