diff --git a/xwords4/common/dictmgr.c b/xwords4/common/dictmgr.c
index 5328f724a..b8f51bc10 100644
--- a/xwords4/common/dictmgr.c
+++ b/xwords4/common/dictmgr.c
@@ -19,9 +19,9 @@
 
 #include <pthread.h>     /* we'll see how long this can stay cross-platform */
 
-#include "dictmgr.h"
 #include "dictnry.h"
 #include "strutils.h"
+#include "dictmgr.h"
 
 #ifdef CPLUS
 extern "C" {
@@ -53,7 +53,7 @@ static XP_S16 findFor( DictMgrCtxt* dmgr, const XP_UCHAR* key );
 #ifdef DEBUG
     static void printInOrder( const DictMgrCtxt* dmgr );
 #else
-    printInOrder( dmgr )
+# define printInOrder( dmgr )
 #endif
 
 #define NOT_FOUND -1
diff --git a/xwords4/common/dictnry.h b/xwords4/common/dictnry.h
index 2335a51d4..af96d1599 100644
--- a/xwords4/common/dictnry.h
+++ b/xwords4/common/dictnry.h
@@ -21,7 +21,9 @@
 #ifndef __DICTNRY_H__
 #define __DICTNRY_H__
 
-#define DEBUG_REF 1
+#ifdef DEBUG
+# define DEBUG_REF 1
+#endif
 
 #include "comtypes.h"