diff --git a/src/libmdb/catalog.c b/src/libmdb/catalog.c
index ca06c9c..e32619a 100644
--- a/src/libmdb/catalog.c
+++ b/src/libmdb/catalog.c
@@ -18,10 +18,6 @@
 
 #include "mdbtools.h"
 
-#ifdef DMALLOC
-#include "dmalloc.h"
-#endif
-
 char *
 mdb_get_objtype_string(int obj_type)
 {
diff --git a/src/libmdb/data.c b/src/libmdb/data.c
index 1ab4279..3a34755 100644
--- a/src/libmdb/data.c
+++ b/src/libmdb/data.c
@@ -21,10 +21,6 @@
 #include <math.h>
 #include "mdbtools.h"
 
-#ifdef DMALLOC
-#include "dmalloc.h"
-#endif
-
 #define OFFSET_MASK 0x1fff
 
 char *mdb_money_to_string(MdbHandle *mdb, int start);
diff --git a/src/libmdb/dump.c b/src/libmdb/dump.c
index 050c362..ea6a61b 100644
--- a/src/libmdb/dump.c
+++ b/src/libmdb/dump.c
@@ -21,10 +21,6 @@
 #include <stdio.h>
 #include <inttypes.h>
 
-#ifdef DMALLOC
-#include "dmalloc.h"
-#endif
-
 void mdb_buffer_dump(const void* buf, off_t start, size_t len)
 {
 	char asc[20];
diff --git a/src/libmdb/file.c b/src/libmdb/file.c
index 411b2d6..4a5b862 100644
--- a/src/libmdb/file.c
+++ b/src/libmdb/file.c
@@ -19,10 +19,6 @@
 #include <inttypes.h>
 #include "mdbtools.h"
 
-#ifdef DMALLOC
-#include "dmalloc.h"
-#endif
-
 /*
 typedef struct {
 	int		pg_size;
diff --git a/src/libmdb/iconv.c b/src/libmdb/iconv.c
index 6c193d0..e212231 100644
--- a/src/libmdb/iconv.c
+++ b/src/libmdb/iconv.c
@@ -19,10 +19,6 @@
 #include <errno.h>
 #include "mdbtools.h"
 
-#ifdef DMALLOC
-#include "dmalloc.h"
-#endif
-
 #ifndef MIN
 #define MIN(a,b) (a>b ? b : a)
 #endif
diff --git a/src/libmdb/index.c b/src/libmdb/index.c
index 4a4a264..a652bcd 100644
--- a/src/libmdb/index.c
+++ b/src/libmdb/index.c
@@ -21,10 +21,6 @@
 #include <mswstr/mswstr.h>
 #endif
 
-#ifdef DMALLOC
-#include "dmalloc.h"
-#endif
-
 MdbIndexPage *mdb_index_read_bottom_pg(MdbHandle *mdb, MdbIndex *idx, MdbIndexChain *chain);
 MdbIndexPage *mdb_chain_add_page(MdbHandle *mdb, MdbIndexChain *chain, guint32 pg);
 
diff --git a/src/libmdb/like.c b/src/libmdb/like.c
index e89c11d..080339d 100644
--- a/src/libmdb/like.c
+++ b/src/libmdb/like.c
@@ -20,10 +20,6 @@
 #include <string.h>
 #include "mdbtools.h"
 
-#ifdef DMALLOC
-#include "dmalloc.h"
-#endif
-
 /**
  * mdb_like_cmp
  * @s: String to search within.
diff --git a/src/libmdb/map.c b/src/libmdb/map.c
index a7e32d0..6fe826e 100644
--- a/src/libmdb/map.c
+++ b/src/libmdb/map.c
@@ -18,10 +18,6 @@
 
 #include "mdbtools.h"
 
-#ifdef DMALLOC
-#include "dmalloc.h"
-#endif
-
 static gint32
 mdb_map_find_next0(MdbHandle *mdb, unsigned char *map, unsigned int map_sz, guint32 start_pg)
 {
diff --git a/src/libmdb/money.c b/src/libmdb/money.c
index 97f9247..d0cf1a0 100644
--- a/src/libmdb/money.c
+++ b/src/libmdb/money.c
@@ -19,10 +19,6 @@
 #include <stdio.h>
 #include "mdbtools.h"
 
-#ifdef DMALLOC
-#include "dmalloc.h"
-#endif
-
 #define MAX_MONEY_PRECISION   20
 #define MAX_NUMERIC_PRECISION 40
 /* 
diff --git a/src/libmdb/options.c b/src/libmdb/options.c
index 2ae9f12..56c550f 100644
--- a/src/libmdb/options.c
+++ b/src/libmdb/options.c
@@ -22,10 +22,6 @@
 #include <stdlib.h>
 #include "mdbtools.h"
 
-#ifdef DMALLOC
-#include "dmalloc.h"
-#endif
-
 #define DEBUG 1
 
 static unsigned long opts;
diff --git a/src/libmdb/sargs.c b/src/libmdb/sargs.c
index ef1456b..1d9c7cd 100644
--- a/src/libmdb/sargs.c
+++ b/src/libmdb/sargs.c
@@ -29,9 +29,6 @@
 
 #include <time.h>
 #include "mdbtools.h"
-#ifdef DMALLOC
-#include "dmalloc.h"
-#endif
 
 void
 mdb_sql_walk_tree(MdbSargNode *node, MdbSargTreeFunc func, gpointer data)
diff --git a/src/libmdb/stats.c b/src/libmdb/stats.c
index 3f55c34..e340871 100644
--- a/src/libmdb/stats.c
+++ b/src/libmdb/stats.c
@@ -18,10 +18,6 @@
 
 #include "mdbtools.h"
 
-#ifdef DMALLOC
-#include "dmalloc.h"
-#endif
-
 /**
  * mdb_stats_on:
  * @mdb: Handle to the (open) MDB file to collect stats on.
diff --git a/src/libmdb/table.c b/src/libmdb/table.c
index 7b262e1..156f8cb 100644
--- a/src/libmdb/table.c
+++ b/src/libmdb/table.c
@@ -18,11 +18,6 @@
 
 #include "mdbtools.h"
 
-#ifdef DMALLOC
-#include "dmalloc.h"
-#endif
-
-
 static gint mdb_col_comparer(MdbColumn **a, MdbColumn **b)
 {
 	if ((*a)->col_num > (*b)->col_num)
diff --git a/src/libmdb/worktable.c b/src/libmdb/worktable.c
index a398d98..ffd2d82 100644
--- a/src/libmdb/worktable.c
+++ b/src/libmdb/worktable.c
@@ -18,10 +18,6 @@
 
 #include "mdbtools.h"
 
-#ifdef DMALLOC
-#include "dmalloc.h"
-#endif
-
 /*
  * Temp table routines.  These are currently used to generate mock results for
  * commands like "list tables" and "describe table"
diff --git a/src/libmdb/write.c b/src/libmdb/write.c
index 93ea10f..a5950c3 100644
--- a/src/libmdb/write.c
+++ b/src/libmdb/write.c
@@ -21,11 +21,6 @@
 #include <inttypes.h>
 #include "mdbtools.h"
 
-#ifdef DMALLOC
-#include "dmalloc.h"
-#endif
-
-
 //static int mdb_copy_index_pg(MdbTableDef *table, MdbIndex *idx, MdbIndexPage *ipg);
 static int mdb_add_row_to_leaf_pg(MdbTableDef *table, MdbIndex *idx, MdbIndexPage *ipg, MdbField *idx_fields, guint32 pgnum, guint16 rownum);
 
diff --git a/src/sql/mdbsql.c b/src/sql/mdbsql.c
index 79a3c36..8af7920 100644
--- a/src/sql/mdbsql.c
+++ b/src/sql/mdbsql.c
@@ -20,10 +20,6 @@
 #define _XOPEN_SOURCE
 #include "mdbsql.h"
 
-#ifdef DMALLOC
-#include "dmalloc.h"
-#endif
-
 #ifdef HAVE_WORDEXP_H
 #define HAVE_WORDEXP
 #include <wordexp.h>
diff --git a/src/util/mdb-array.c b/src/util/mdb-array.c
index 511e474..3c2c8d0 100644
--- a/src/util/mdb-array.c
+++ b/src/util/mdb-array.c
@@ -21,10 +21,6 @@
 
 #include "mdbtools.h"
 
-#ifdef DMALLOC
-#include "dmalloc.h"
-#endif
-
 int
 main (int argc, char **argv)
 {
diff --git a/src/util/mdb-export.c b/src/util/mdb-export.c
index 16c78d3..49ee723 100755
--- a/src/util/mdb-export.c
+++ b/src/util/mdb-export.c
@@ -18,10 +18,6 @@
 
 #include "mdbtools.h"
 
-#ifdef DMALLOC
-#include "dmalloc.h"
-#endif
-
 #undef MDB_BIND_SIZE
 #define MDB_BIND_SIZE 200000
 
diff --git a/src/util/mdb-header.c b/src/util/mdb-header.c
index 290c3ee..5a269fc 100644
--- a/src/util/mdb-header.c
+++ b/src/util/mdb-header.c
@@ -22,10 +22,6 @@
 #include <string.h>
 #include "mdbtools.h"
 
-#ifdef DMALLOC
-#include "dmalloc.h"
-#endif
-
 void copy_header (FILE *f)
 {
  fprintf (f, "/******************************************************************/\n");
diff --git a/src/util/mdb-parsecsv.c b/src/util/mdb-parsecsv.c
index 807ece5..3273df5 100644
--- a/src/util/mdb-parsecsv.c
+++ b/src/util/mdb-parsecsv.c
@@ -24,10 +24,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-#ifdef DMALLOC
-#include "dmalloc.h"
-#endif
-
 #define FILENAMESIZE 128
 #define BUFFERSIZE 4096
 #define LF 10
diff --git a/src/util/mdb-schema.c b/src/util/mdb-schema.c
index 1ec3bec..c62c2e3 100644
--- a/src/util/mdb-schema.c
+++ b/src/util/mdb-schema.c
@@ -19,10 +19,6 @@
 /* this utility dumps the schema for an existing database */
 #include "mdbtools.h"
 
-#ifdef DMALLOC
-#include "dmalloc.h"
-#endif
-
 int
 main (int argc, char **argv)
 {
diff --git a/src/util/mdb-sql.c b/src/util/mdb-sql.c
index 0279df3..f74d855 100644
--- a/src/util/mdb-sql.c
+++ b/src/util/mdb-sql.c
@@ -47,10 +47,6 @@ extern void clear_history ();
 #include <string.h>
 #include "mdbsql.h"
 
-#ifdef DMALLOC
-#include "dmalloc.h"
-#endif
-
 void dump_results(FILE *out, MdbSQL *sql, char *delimiter);
 void dump_results_pp(FILE *out, MdbSQL *sql);
 
diff --git a/src/util/mdb-tables.c b/src/util/mdb-tables.c
index 0ae5a08..833a87a 100644
--- a/src/util/mdb-tables.c
+++ b/src/util/mdb-tables.c
@@ -20,10 +20,6 @@
 
 #include "mdbtools.h"
 
-#ifdef DMALLOC
-#include "dmalloc.h"
-#endif
-
 struct type_struct {
 	char *name;
 	int value;
diff --git a/src/util/mdb-ver.c b/src/util/mdb-ver.c
index 656164d..80e0568 100644
--- a/src/util/mdb-ver.c
+++ b/src/util/mdb-ver.c
@@ -21,10 +21,6 @@
 #include "mdbver.h"
 #include "mdbprivate.h"
 
-#ifdef DMALLOC
-#include "dmalloc.h"
-#endif
-
 int
 main(int argc, char **argv)
 {