diff --git a/source/args.c b/source/args.c
index 878920c..3811fe1 100644
--- a/source/args.c
+++ b/source/args.c
@@ -15,7 +15,7 @@
 #include <stdbool.h>
 #include <string.h>
 
-#include "alloc.h"
+#include "memory.h"
 #include "string.h"
 #include "log.h"
 
diff --git a/source/array.c b/source/array.c
index c4d8323..28da117 100644
--- a/source/array.c
+++ b/source/array.c
@@ -12,7 +12,7 @@
  * Generic, bounds checked value arrays
  */
 
-#include "alloc.h"
+#include "memory.h"
 #include "array.h"
 #include "log.h"
 
diff --git a/source/bitmap.c b/source/bitmap.c
index 77bf4e3..05ad8b7 100644
--- a/source/bitmap.c
+++ b/source/bitmap.c
@@ -18,7 +18,7 @@
 #include <string.h>
 #include <math.h>
 
-#include "alloc.h"
+#include "memory.h"
 #include "maths.h"
 #include "log.h"
 #include "storage.h"
diff --git a/source/bytes.c b/source/bytes.c
index afea82e..60b34c6 100644
--- a/source/bytes.c
+++ b/source/bytes.c
@@ -14,7 +14,7 @@
 
 #include <stdlib.h>
 
-#include "alloc.h"
+#include "memory.h"
 #include "log.h"
 #include "checksum.h"
 
diff --git a/source/compress.c b/source/compress.c
index f617e34..0193471 100644
--- a/source/compress.c
+++ b/source/compress.c
@@ -14,7 +14,7 @@
  * @note Currently some custom Huffman tree based compression
  */
 
-#include "alloc.h"
+#include "memory.h"
 #include "string.h"
 #include "log.h"
 
diff --git a/source/crypto_hash_cubehash.c b/source/crypto_hash_cubehash.c
index 7e1ed81..886875e 100644
--- a/source/crypto_hash_cubehash.c
+++ b/source/crypto_hash_cubehash.c
@@ -13,7 +13,7 @@
  */
 
 #include "error.h"
-#include "alloc.h"
+#include "memory.h"
 #include "string.h"
 #include "log.h"
 
diff --git a/source/crypto_symmetric.c b/source/crypto_symmetric.c
index f848c82..4aa7c16 100644
--- a/source/crypto_symmetric.c
+++ b/source/crypto_symmetric.c
@@ -12,7 +12,7 @@
  * Symmetric cryptography
  */
 
-#include "alloc.h"
+#include "memory.h"
 #include "log.h"
 #include "error.h"
 
diff --git a/source/file.c b/source/file.c
index 67c5d3c..ab320a7 100644
--- a/source/file.c
+++ b/source/file.c
@@ -14,7 +14,7 @@
 
 #include "storage.h"
 #include "error.h"
-#include "alloc.h"
+#include "memory.h"
 #include "log.h"
 
 #include "file.h"
diff --git a/source/alloc.c b/source/memory.c
similarity index 99%
rename from source/alloc.c
rename to source/memory.c
index acb58af..edc1cb3 100644
--- a/source/alloc.c
+++ b/source/memory.c
@@ -19,7 +19,7 @@
 
 #include "error.h"
 
-#include "alloc.h"
+#include "memory.h"
 
 void *DgAlloc(size_t size) {
 	/**
diff --git a/source/alloc.h b/source/memory.h
similarity index 100%
rename from source/alloc.h
rename to source/memory.h
diff --git a/source/memory_stream.c b/source/memory_stream.c
index 92fd53c..1670a09 100644
--- a/source/memory_stream.c
+++ b/source/memory_stream.c
@@ -18,7 +18,7 @@
 #include <string.h>
 #include <stdlib.h>
 
-#include "alloc.h"
+#include "memory.h"
 #include "log.h"
 
 #include "memory_stream.h"
diff --git a/source/storage.c b/source/storage.c
index 0ff305c..ee7994f 100644
--- a/source/storage.c
+++ b/source/storage.c
@@ -15,7 +15,7 @@
 #include "common.h"
 
 #include "error.h"
-#include "alloc.h"
+#include "memory.h"
 #include "string.h"
 #include "log.h"
 
diff --git a/source/storage_filesystem.c b/source/storage_filesystem.c
index d565c5a..32c6e55 100644
--- a/source/storage_filesystem.c
+++ b/source/storage_filesystem.c
@@ -24,7 +24,7 @@
 	#define mkdir(path) _mkdir(path)
 #endif
 
-#include "alloc.h"
+#include "memory.h"
 #include "string.h"
 #include "storage.h"
 #include "log.h"
diff --git a/source/storage_void.c b/source/storage_void.c
index 27ad7e6..643b46e 100644
--- a/source/storage_void.c
+++ b/source/storage_void.c
@@ -14,7 +14,7 @@
  * @note This can be used as a basis for other storage classes.
  */
 
-#include "alloc.h"
+#include "memory.h"
 #include "string.h"
 #include "storage.h"
 #include "log.h"
diff --git a/source/string.c b/source/string.c
index a181361..94bd9ae 100644
--- a/source/string.c
+++ b/source/string.c
@@ -19,7 +19,7 @@
 #include <stdlib.h>
 #include <stdbool.h>
 
-#include "alloc.h"
+#include "memory.h"
 #include "bits.h"
 #include "log.h"
 
diff --git a/source/table.c b/source/table.c
index 37dfebb..41194cf 100644
--- a/source/table.c
+++ b/source/table.c
@@ -16,7 +16,7 @@
  * array in the order they were inserted.
  */
 
-#include "alloc.h"
+#include "memory.h"
 #include "error.h"
 #include "log.h"
 
diff --git a/source/value.c b/source/value.c
index 728b2a4..13536f8 100644
--- a/source/value.c
+++ b/source/value.c
@@ -16,7 +16,7 @@
 
 #include "string.h"
 #include "checksum.h"
-#include "alloc.h"
+#include "memory.h"
 #include "log.h"
 
 // HACK HACK HACK This works thanks to #pragma once, though I wish it were eaiser for module to cross depend