diff --git a/.gitignore b/.gitignore
index af66a8fb..8e5877fb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,6 +15,7 @@ vglog*
 c/*.test
 cpp/*.test
 
+apps/db_dump/mosquitto_db_dump
 apps/mosquitto_passwd/mosquitto_passwd
 
 build/
@@ -51,7 +52,6 @@ man/mqtt.7
 
 out/
 
-src/db_dump/mosquitto_db_dump
 src/mosquitto
 
 test/broker/broker.pid
diff --git a/apps/Makefile b/apps/Makefile
index a04fbd5e..910fcc4d 100644
--- a/apps/Makefile
+++ b/apps/Makefile
@@ -1,4 +1,5 @@
 DIRS= \
+		db_dump \
 		mosquitto_passwd
 
 .PHONY : all binary check clean reallyclean test install uninstall
diff --git a/src/db_dump/Makefile b/apps/db_dump/Makefile
similarity index 68%
rename from src/db_dump/Makefile
rename to apps/db_dump/Makefile
index a7a2b6b8..2f06f57f 100644
--- a/src/db_dump/Makefile
+++ b/apps/db_dump/Makefile
@@ -1,11 +1,13 @@
 include ../../config.mk
 
-CFLAGS_FINAL=${CFLAGS} -I.. -I../../ -I../../lib -I../.. -I../deps -DWITH_BROKER -DWITH_PERSISTENCE
+CFLAGS_FINAL=${CFLAGS} -I../../include -I../../ -I../../lib -I../../src -I../../deps -DWITH_BROKER -DWITH_PERSISTENCE
 
 OBJS = \
 	   db_dump.o \
 	   print.o \
 	   \
+	   memory_mosq.o \
+	   memory_public.o \
 	   packet_datatypes.o \
 	   packet_mosq.o \
 	   persist_read.o \
@@ -25,10 +27,16 @@ all : mosquitto_db_dump
 mosquitto_db_dump : ${OBJS}
 	${CROSS_COMPILE}${CC} $^ -o $@ ${LDFLAGS} ${LIBS}
 
-db_dump.o : db_dump.c db_dump.h ../persist.h
+db_dump.o : db_dump.c db_dump.h ../../src/persist.h
 	${CROSS_COMPILE}${CC} $(CFLAGS_FINAL) -c $< -o $@
 
-print.o : print.c db_dump.h ../persist.h
+print.o : print.c db_dump.h ../../src/persist.h
+	${CROSS_COMPILE}${CC} $(CFLAGS_FINAL) -c $< -o $@
+
+memory_mosq.o : ../../lib/memory_mosq.c ../../lib/memory_mosq.h
+	${CROSS_COMPILE}${CC} $(CFLAGS_FINAL) -c $< -o $@
+
+memory_public.o : ../../src/memory_public.c
 	${CROSS_COMPILE}${CC} $(CFLAGS_FINAL) -c $< -o $@
 
 net_mosq.o : ../../lib/net_mosq.c ../../lib/net_mosq.h
@@ -40,13 +48,13 @@ packet_datatypes.o : ../../lib/packet_datatypes.c ../../lib/packet_mosq.h
 packet_mosq.o : ../../lib/packet_mosq.c ../../lib/packet_mosq.h
 	${CROSS_COMPILE}${CC} $(CFLAGS_FINAL) -c $< -o $@
 
-persist_read.o : ../persist_read.c ../persist.h ../mosquitto_broker_internal.h
+persist_read.o : ../../src/persist_read.c ../../src/persist.h ../../src/mosquitto_broker_internal.h
 	${CROSS_COMPILE}${CC} $(CFLAGS_FINAL) -c $< -o $@
 
-persist_read_v234.o : ../persist_read_v234.c ../persist.h ../mosquitto_broker_internal.h
+persist_read_v234.o : ../../src/persist_read_v234.c ../../src/persist.h ../../src/mosquitto_broker_internal.h
 	${CROSS_COMPILE}${CC} $(CFLAGS_FINAL) -c $< -o $@
 
-persist_read_v5.o : ../persist_read_v5.c ../persist.h ../mosquitto_broker_internal.h
+persist_read_v5.o : ../../src/persist_read_v5.c ../../src/persist.h ../../src/mosquitto_broker_internal.h
 	${CROSS_COMPILE}${CC} $(CFLAGS_FINAL) -c $< -o $@
 
 property_mosq.o : ../../lib/property_mosq.c ../../lib/property_mosq.h
diff --git a/src/db_dump/db_dump.c b/apps/db_dump/db_dump.c
similarity index 100%
rename from src/db_dump/db_dump.c
rename to apps/db_dump/db_dump.c
diff --git a/src/db_dump/db_dump.h b/apps/db_dump/db_dump.h
similarity index 100%
rename from src/db_dump/db_dump.h
rename to apps/db_dump/db_dump.h
diff --git a/src/db_dump/print.c b/apps/db_dump/print.c
similarity index 100%
rename from src/db_dump/print.c
rename to apps/db_dump/print.c
diff --git a/src/db_dump/stubs.c b/apps/db_dump/stubs.c
similarity index 85%
rename from src/db_dump/stubs.c
rename to apps/db_dump/stubs.c
index bc2715f1..868c1905 100644
--- a/src/db_dump/stubs.c
+++ b/apps/db_dump/stubs.c
@@ -28,17 +28,6 @@ int log__printf(struct mosquitto *mosq, int level, const char *fmt, ...)
 	return 0;
 }
 
-
-void *mosquitto__calloc(size_t nmemb, size_t len)
-{
-	return calloc(nmemb, len);
-}
-
-void mosquitto__free(void *p)
-{
-	free(p);
-}
-
 FILE *mosquitto__fopen(const char *path, const char *mode, bool restrict_read)
 {
 	return NULL;
@@ -49,16 +38,6 @@ enum mosquitto_client_state mosquitto__get_state(struct mosquitto *mosq)
 	return mosq_cs_new;
 }
 
-void *mosquitto__malloc(size_t len)
-{
-	return malloc(len);
-}
-
-char *mosquitto__strdup(const char *s)
-{
-	return strdup(s);
-}
-
 ssize_t net__read(struct mosquitto *mosq, void *buf, size_t count)
 {
 	return 0;
@@ -83,3 +62,8 @@ int sub__messages_queue(struct mosquitto_db *db, const char *source_id, const ch
 {
 	return 0;
 }
+
+int keepalive__update(struct mosquitto *context)
+{
+	return 0;
+}