diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index b83dc8a7..b89b8fa9 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -131,8 +131,8 @@ set(sources
         log.h
         main.c
         main.h
-        memory.c
-        memory.h
+        syscalls.c
+        syscalls.h
         overTime.c
         overTime.h
         regex.c
diff --git a/src/FTL.h b/src/FTL.h
index cf645050..d1811cd1 100644
--- a/src/FTL.h
+++ b/src/FTL.h
@@ -114,7 +114,7 @@
 // Important: This number has to be smaller than 256 for this mechanism to work
 #define NUM_RECHECKS 3
 
-// Use out own memory handling functions that will detect possible errors
+// Use out own syscalls handling functions that will detect possible errors
 // and report accordingly in the log. This will make debugging FTL crashs
 // caused by insufficient memory or by code bugs (not properly dealing
 // with NULL pointers) much easier.
@@ -124,6 +124,7 @@
 #define strdup(str_in) FTLstrdup(str_in, __FILE__,  __FUNCTION__,  __LINE__)
 #define calloc(numer_of_elements, element_size) FTLcalloc(numer_of_elements, element_size, __FILE__,  __FUNCTION__,  __LINE__)
 #define realloc(ptr, new_size) FTLrealloc(ptr, new_size, __FILE__,  __FUNCTION__,  __LINE__)
+#include "syscalls.h"
 
 // Preprocessor help functions
 #define str(x) # x
diff --git a/src/api/socket.c b/src/api/socket.c
index a5fb901d..3eb8e0d0 100644
--- a/src/api/socket.c
+++ b/src/api/socket.c
@@ -10,13 +10,12 @@
 
 #include "FTL.h"
 #include "api.h"
-#include "log.h"
+#include "../log.h"
 #include "socket.h"
 #include "request.h"
-#include "config.h"
-#include "memory.h"
+#include "../config.h"
 // global variable killed
-#include "signals.h"
+#include "../signals.h"
 
 // The backlog argument defines the maximum length
 // to which the queue of pending connections for
diff --git a/src/args.c b/src/args.c
index b196a83f..0878f43f 100644
--- a/src/args.c
+++ b/src/args.c
@@ -16,7 +16,6 @@
 #include "FTL.h"
 #include "args.h"
 #include "version.h"
-#include "memory.h"
 #include "main.h"
 #include "log.h"
 // global variable killed
diff --git a/src/capabilities.c b/src/capabilities.c
index 6478526c..013bba64 100644
--- a/src/capabilities.c
+++ b/src/capabilities.c
@@ -14,7 +14,6 @@
 #undef __USE_XOPEN
 #include "FTL.h"
 #include "capabilities.h"
-#include "memory.h"
 #include "config.h"
 #include "log.h"
 
diff --git a/src/config.c b/src/config.c
index 7d840524..64fdffa8 100644
--- a/src/config.c
+++ b/src/config.c
@@ -10,7 +10,6 @@
 
 #include "FTL.h"
 #include "config.h"
-#include "memory.h"
 #include "setupVars.h"
 #include "log.h"
 // nice()
diff --git a/src/daemon.c b/src/daemon.c
index e9a29d93..2d72d20b 100644
--- a/src/daemon.c
+++ b/src/daemon.c
@@ -10,7 +10,6 @@
 
 #include "FTL.h"
 #include "daemon.h"
-#include "memory.h"
 #include "config.h"
 #include "log.h"
 // sleepms()
diff --git a/src/database/aliasclients.c b/src/database/aliasclients.c
index 2097d0c7..023c402a 100644
--- a/src/database/aliasclients.c
+++ b/src/database/aliasclients.c
@@ -17,8 +17,6 @@
 #include "../config.h"
 // logg()
 #include "../log.h"
-// calloc()
-#include "../memory.h"
 // getAliasclientIDfromIP()
 #include "network-table.h"
 
diff --git a/src/database/common.c b/src/database/common.c
index 2f50b1e6..2839255c 100644
--- a/src/database/common.c
+++ b/src/database/common.c
@@ -13,7 +13,6 @@
 #include "network-table.h"
 #include "message-table.h"
 #include "../shmem.h"
-#include "../memory.h"
 // struct config
 #include "../config.h"
 // logg()
diff --git a/src/database/gravity-db.c b/src/database/gravity-db.c
index de8da8b6..13187cea 100644
--- a/src/database/gravity-db.c
+++ b/src/database/gravity-db.c
@@ -30,6 +30,9 @@
 // reset_aliasclient()
 #include "aliasclients.h"
 
+// Definition of struct regex_data
+#include "../regex_r.h"
+
 // Prefix of interface names in the client table
 #define INTERFACE_SEP ":"
 
diff --git a/src/database/gravity-db.h b/src/database/gravity-db.h
index e4ce7bf0..c92f671b 100644
--- a/src/database/gravity-db.h
+++ b/src/database/gravity-db.h
@@ -10,12 +10,9 @@
 #ifndef GRAVITY_H
 #define GRAVITY_H
 
-// global variable counters
-#include "memory.h"
-// clients data structure
-#include "datastructure.h"
-
-// Definition of struct regex_data
+// clientsData
+#include "../datastructure.h"
+// regex_data
 #include "../regex_r.h"
 
 // Table indices
diff --git a/src/database/network-table.c b/src/database/network-table.c
index ef12136d..40c9f9ab 100644
--- a/src/database/network-table.c
+++ b/src/database/network-table.c
@@ -12,8 +12,6 @@
 #include "network-table.h"
 #include "common.h"
 #include "../shmem.h"
-// strdup()
-#include "../memory.h"
 #include "../log.h"
 // timer_elapsed_msec()
 #include "../timers.h"
diff --git a/src/database/query-table.c b/src/database/query-table.c
index 3bd3ca93..6b04f9ed 100644
--- a/src/database/query-table.c
+++ b/src/database/query-table.c
@@ -25,8 +25,6 @@
 #include "../config.h"
 // getstr()
 #include "../shmem.h"
-// free()
-#include "../memory.h"
 
 static bool saving_failed_before = false;
 
diff --git a/src/datastructure.c b/src/datastructure.c
index dfa0bd24..ff8c7510 100644
--- a/src/datastructure.c
+++ b/src/datastructure.c
@@ -10,7 +10,6 @@
 
 #include "FTL.h"
 #include "datastructure.h"
-#include "memory.h"
 #include "shmem.h"
 #include "log.h"
 // enum REGEX
diff --git a/src/dnsmasq_interface.c b/src/dnsmasq_interface.c
index c97b68d2..0a0e96f1 100644
--- a/src/dnsmasq_interface.c
+++ b/src/dnsmasq_interface.c
@@ -16,7 +16,6 @@
 #include "dnsmasq_interface.h"
 #include "shmem.h"
 #include "overTime.h"
-#include "memory.h"
 #include "database/common.h"
 #include "database/database-thread.h"
 #include "datastructure.h"
diff --git a/src/files.c b/src/files.c
index 7f1d3d94..cdcbeb80 100644
--- a/src/files.c
+++ b/src/files.c
@@ -10,7 +10,6 @@
 
 #include "FTL.h"
 #include "files.h"
-#include "memory.h"
 #include "config.h"
 #include "setupVars.h"
 #include "log.h"
diff --git a/src/gc.c b/src/gc.c
index 618fa2e1..efe0c9e7 100644
--- a/src/gc.c
+++ b/src/gc.c
@@ -16,8 +16,6 @@
 #include "overTime.h"
 #include "database/common.h"
 #include "log.h"
-// global variable counters
-#include "memory.h"
 // global variable killed
 #include "signals.h"
 // data getter functions
diff --git a/src/log.c b/src/log.c
index 9cde7d37..28885f41 100644
--- a/src/log.c
+++ b/src/log.c
@@ -10,7 +10,6 @@
 
 #include "FTL.h"
 #include "version.h"
-#include "memory.h"
 // is_fork()
 #include "daemon.h"
 #include "config.h"
diff --git a/src/overTime.c b/src/overTime.c
index b0315a29..53e23765 100644
--- a/src/overTime.c
+++ b/src/overTime.c
@@ -13,8 +13,6 @@
 #include "shmem.h"
 #include "config.h"
 #include "log.h"
-// global variable counters
-#include "memory.h"
 // data getter functions
 #include "datastructure.h"
 
diff --git a/src/regex.c b/src/regex.c
index 818981f2..5a0807a3 100644
--- a/src/regex.c
+++ b/src/regex.c
@@ -11,7 +11,6 @@
 #include "FTL.h"
 #include "regex_r.h"
 #include "timers.h"
-#include "memory.h"
 #include "log.h"
 #include "config.h"
 // data getter functions
diff --git a/src/resolve.c b/src/resolve.c
index cd71996e..4719f94c 100644
--- a/src/resolve.c
+++ b/src/resolve.c
@@ -11,7 +11,6 @@
 #include "FTL.h"
 #include "resolve.h"
 #include "shmem.h"
-#include "memory.h"
 // struct config
 #include "config.h"
 // sleepms()
diff --git a/src/setupVars.c b/src/setupVars.c
index d018a797..34c00f32 100644
--- a/src/setupVars.c
+++ b/src/setupVars.c
@@ -10,7 +10,6 @@
 
 #include "FTL.h"
 #include "log.h"
-#include "memory.h"
 #include "config.h"
 #include "setupVars.h"
 
diff --git a/src/shmem.c b/src/shmem.c
index bacd53fe..bd922480 100644
--- a/src/shmem.c
+++ b/src/shmem.c
@@ -12,7 +12,6 @@
 #include "shmem.h"
 #include "overTime.h"
 #include "log.h"
-#include "memory.h"
 #include "config.h"
 // data getter functions
 #include "datastructure.h"
diff --git a/src/signals.c b/src/signals.c
index b5ec061d..f39dd6cb 100644
--- a/src/signals.c
+++ b/src/signals.c
@@ -15,8 +15,6 @@
 #include "signals.h"
 // logg()
 #include "log.h"
-// free()
-#include "memory.h"
 // ls_dir()
 #include "files.h"
 // gettid()
diff --git a/src/memory.c b/src/syscalls.c
similarity index 99%
rename from src/memory.c
rename to src/syscalls.c
index 81dae6be..d3618874 100644
--- a/src/memory.c
+++ b/src/syscalls.c
@@ -10,7 +10,7 @@
 
 #include "FTL.h"
 #include "shmem.h"
-#include "memory.h"
+#include "syscalls.h"
 #include "log.h"
 
 // The special memory handling routines have to be the last ones in this source file
diff --git a/src/memory.h b/src/syscalls.h
similarity index 90%
rename from src/memory.h
rename to src/syscalls.h
index 72ea92b0..e3fdd4ed 100644
--- a/src/memory.h
+++ b/src/syscalls.h
@@ -3,12 +3,12 @@
 *  Network-wide ad blocking via your own hardware.
 *
 *  FTL Engine
-*  Memory prototypes
+*  Syscall prototypes
 *
 *  This file is copyright under the latest version of the EUPL.
 *  Please see LICENSE file for your rights under this license. */
-#ifndef MEMORY_H
-#define MEMORY_H
+#ifndef SYSCALLS_H
+#define SYSCALLS_H
 
 #include "enums.h"
 
@@ -17,4 +17,4 @@ void *FTLcalloc(size_t n, size_t size, const char *file, const char *function, c
 void *FTLrealloc(void *ptr_in, size_t size, const char *file, const char *function, const int line) __attribute__((alloc_size(2)));
 void FTLfree(void *ptr, const char* file, const char *function, const int line);
 
-#endif //MEMORY_H
+#endif //SYSCALLS_H
diff --git a/src/timers.c b/src/timers.c
index 56cfc125..691e16ba 100644
--- a/src/timers.c
+++ b/src/timers.c
@@ -10,7 +10,6 @@
 
 #include "FTL.h"
 #include "timers.h"
-#include "memory.h"
 #include "log.h"
 
 struct timespec t0[NUMTIMERS];