diff --git a/chunk_loc.h b/chunk_loc.h
index f9f43a7..c295fb6 100644
--- a/chunk_loc.h
+++ b/chunk_loc.h
@@ -48,12 +48,6 @@
 /* log-bad-space info */
 #define SPECIAL_CHARS		"\"\"''\\\\n\nr\rt\tb\bf\fa\007"
 
-/*
- * Maximum level in the skip list.  This implies that we can only
- * store 2^32 entries optimally.  Needless to say this is plenty.
- */
-#define MAX_SKIP_LEVEL		32
-
 /* memory table settings */
 #define MEM_ALLOC_ENTRIES	(MEMORY_TABLE_SIZE * 2)
 #define MEM_CHANGED_ENTRIES	(MEMORY_TABLE_SIZE * 2)
diff --git a/dmalloc_tab_loc.h b/dmalloc_tab_loc.h
index 42219e6..fad6559 100644
--- a/dmalloc_tab_loc.h
+++ b/dmalloc_tab_loc.h
@@ -24,23 +24,6 @@
 
 #include "conf.h"
 
-/*
- * Maximum number of splits.  This should mean that these routines can
- * handle at least 2^128 different values (that's _quite_ a few).  And
- * then you can always increase the value.
- */
-#define MAX_QSORT_SPLITS	128
-
-/*
- * Maximum number of entries that must be in list for it to be
- * partitioned.  If there are fewer elements then just do our
- * insertion sort.
- */
-#define MAX_QSORT_PARTITION	8
-
-/* comparison function */
-typedef int	(*compare_t)(const void *element1_p, const void *element2_p);
-
 /*
  * void HASH_MIX
  *
diff --git a/settings.dist b/settings.dist
index ecf374f..0eddb3d 100644
--- a/settings.dist
+++ b/settings.dist
@@ -126,6 +126,12 @@
 #define MAX_FILE_LENGTH		  100
 #define MAX_LINE_NUMBER		30000
 
+/*
+ * Maximum level in the skip list.  This implies that we can only
+ * store 2^32 entries optimally.  Needless to say this is plenty.
+ */
+#define MAX_SKIP_LEVEL		32
+
 /*
  * The largest allowable allocation size.  This is only for
  * verification purposes to control allocations of bizarre sizes.  Any
@@ -341,6 +347,20 @@
  */
 #define FREED_POINTER_DELAY 20
 
+/*
+ * Maximum number of splits.  This should mean that these routines can
+ * handle at least 2^128 different values (that's _quite_ a few).  And
+ * then you can always increase the value.
+ */
+#define MAX_QSORT_SPLITS 128
+
+/*
+ * Maximum number of entries that must be in list for it to be
+ * partitioned.  If there are fewer elements then just do our
+ * insertion sort.
+ */
+#define MAX_QSORT_PARTITION 8
+
 /*
  * Size of the table of file and line number memory entries.  This
  * memory table records the top locations by file/line or