--- a/dbmalloc.h	Thu Mar 01 23:47:46 2018 +0800
+++ b/dbmalloc.h	Fri Mar 02 00:02:06 2018 +0800
@@ -1,7 +1,9 @@
 #ifndef DBMALLOC_H_
 #define DBMALLOC_H_
 
-#include "includes.h"
+#include "stdint.h"
+#include "stdlib.h"
+#include "options.h"
 
 void * m_malloc(size_t size);
 void * m_calloc(size_t nmemb, size_t size);
@@ -10,16 +12,16 @@
 
 #if DROPBEAR_TRACKING_MALLOC
 void m_free_direct(void* ptr);
-#define m_free(X) do {m_free_direct(X); (X) = NULL;} while (0)
 void m_malloc_set_epoch(unsigned int epoch);
 void m_malloc_free_epoch(unsigned int epoch, int dofree);
 
 #else
 /* plain wrapper */
-
-#define m_free(X) do {free(X); (X) = NULL;} while (0)
+#define m_free_direct free
 
 #endif
 
+#define m_free(X) do {m_free_direct(X); (X) = NULL;} while (0)
+
 
 #endif /* DBMALLOC_H_ */