diff --git a/Makefile b/Makefile
index 27585fa..1127742 100644
--- a/Makefile
+++ b/Makefile
@@ -2,11 +2,14 @@
 
 .PHONY: all cmc dev sac utl tests FORCE
 
-all: cmc dev sac utl tests
+all: cmc cor dev sac utl tests
 
 cmc: FORCE
 	clang-format --style=file -i ./src/cmc/*.h
 
+cor: FORCE
+	clang-format --style=file -i ./src/cor/*.h
+
 dev: FORCE
 	clang-format --style=file -i ./src/dev/*.h
 
diff --git a/src/cor/hashtable.h b/src/cor/hashtable.h
index f69e6f8..877a1e5 100644
--- a/src/cor/hashtable.h
+++ b/src/cor/hashtable.h
@@ -39,7 +39,8 @@ enum cmc_entry_state
 /**
  * static const size_t cmc_hashtable_primes[59]
  *
- * Prime numbers used to define a capacity for the hashtables for better hashing.
+ * Prime numbers used to define a capacity for the hashtables for better
+ * hashing.
  */
 // clang-format off
 static const size_t cmc_hashtable_primes[] = {
diff --git a/src/macro_collections.h b/src/macro_collections.h
index dc4c07a..f917c8e 100644
--- a/src/macro_collections.h
+++ b/src/macro_collections.h
@@ -25,6 +25,9 @@
 #define CMC_COLLECTION_GENERATE_SOURCE(C, PFX, SNAME, K, V) \
     CMC_CONCAT(C, SOURCE)(PFX, SNAME, K, V)
 
+#include "cor/core.h"         /* Added in 17/03/2020 */
+#include "cor/hashtable.h"    /* Added in 17/03/2020 */
+
 #include "cmc/bidimap.h"      /* Added in 26/09/2019 */
 #include "cmc/deque.h"        /* Added in 20/03/2019 */
 #include "cmc/hashmap.h"      /* Added in 03/04/2019 */