diff --git a/aom_dsp/dkboolreader.h b/aom_dsp/dkboolreader.h
index a2f67ff..531c5dc 100644
--- a/aom_dsp/dkboolreader.h
+++ b/aom_dsp/dkboolreader.h
@@ -19,13 +19,13 @@
 #if CONFIG_BITSTREAM_DEBUG
 #include <assert.h>
 #include <stdio.h>
+#include "aom_util/debug_util.h"
 #endif  // CONFIG_BITSTREAM_DEBUG
 
 #include "aom_ports/mem.h"
 #include "aom/aomdx.h"
 #include "aom/aom_integer.h"
 #include "aom_dsp/prob.h"
-#include "aom_util/debug_util.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/aom_dsp/dkboolwriter.h b/aom_dsp/dkboolwriter.h
index ebad40e..8475238 100644
--- a/aom_dsp/dkboolwriter.h
+++ b/aom_dsp/dkboolwriter.h
@@ -16,11 +16,11 @@
 
 #if CONFIG_BITSTREAM_DEBUG
 #include <stdio.h>
-#endif
+#include "aom_util/debug_util.h"
+#endif  // CONFIG_BITSTREAM_DEBUG
 
 #include "aom_dsp/prob.h"
 #include "aom_ports/mem.h"
-#include "aom_util/debug_util.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/aom_util/aom_util.mk b/aom_util/aom_util.mk
index d79acdb..fcf0d70 100644
--- a/aom_util/aom_util.mk
+++ b/aom_util/aom_util.mk
@@ -12,6 +12,6 @@
 UTIL_SRCS-yes += aom_util.mk
 UTIL_SRCS-yes += aom_thread.c
 UTIL_SRCS-yes += aom_thread.h
-UTIL_SRCS-yes += debug_util.c
-UTIL_SRCS-yes += debug_util.h
+UTIL_SRCS-$(CONFIG_BITSTREAM_DEBUG) += debug_util.c
+UTIL_SRCS-$(CONFIG_BITSTREAM_DEBUG) += debug_util.h
 UTIL_SRCS-yes += endian_inl.h
diff --git a/aom_util/debug_util.c b/aom_util/debug_util.c
index ca666a1..0385df7 100644
--- a/aom_util/debug_util.c
+++ b/aom_util/debug_util.c
@@ -8,10 +8,10 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "aom_util/debug_util.h"
 #include <assert.h>
 #include <stdio.h>
-#if CONFIG_BITSTREAM_DEBUG
+#include "aom_util/debug_util.h"
+
 #define QUEUE_MAX_SIZE 2000000
 static int result_queue[QUEUE_MAX_SIZE];
 static int prob_queue[QUEUE_MAX_SIZE];
@@ -27,11 +27,11 @@
 
 void bitstream_queue_set_frame_write(int frame_idx) { frame_idx_w = frame_idx; }
 
-int bitstream_queue_get_frame_write() { return frame_idx_w; }
+int bitstream_queue_get_frame_write(void) { return frame_idx_w; }
 
 void bitstream_queue_set_frame_read(int frame_idx) { frame_idx_r = frame_idx; }
 
-int bitstream_queue_get_frame_read() { return frame_idx_r; }
+int bitstream_queue_get_frame_read(void) { return frame_idx_r; }
 
 void bitstream_queue_set_skip_write(int skip) { skip_w = skip; }
 
@@ -68,4 +68,3 @@
     }
   }
 }
-#endif  // CONFIG_BITSTREAM_DEBUG
diff --git a/aom_util/debug_util.h b/aom_util/debug_util.h
index 5cad87c..7c2299a 100644
--- a/aom_util/debug_util.h
+++ b/aom_util/debug_util.h
@@ -17,7 +17,6 @@
 extern "C" {
 #endif
 
-#if CONFIG_BITSTREAM_DEBUG
 /* This is a debug tool used to detect bitstream error. On encoder side, it
  * pushes each bit and probability into a queue before the bit is written into
  * the Arithmetic coder. On decoder side, whenever a bit is read out from the
@@ -35,10 +34,9 @@
 void bitstream_queue_set_skip_write(int skip);
 void bitstream_queue_set_skip_read(int skip);
 void bitstream_queue_set_frame_write(int frame_idx);
-int bitstream_queue_get_frame_write();
+int bitstream_queue_get_frame_write(void);
 void bitstream_queue_set_frame_read(int frame_idx);
-int bitstream_queue_get_frame_read();
-#endif  // CONFIG_BITSTREAM_DEBUG
+int bitstream_queue_get_frame_read(void);
 
 #ifdef __cplusplus
 }  // extern "C"
diff --git a/av1/encoder/bitstream.c b/av1/encoder/bitstream.c
index ce16fcf..4f50302 100644
--- a/av1/encoder/bitstream.c
+++ b/av1/encoder/bitstream.c
@@ -19,7 +19,9 @@
 #include "aom_mem/aom_mem.h"
 #include "aom_ports/mem_ops.h"
 #include "aom_ports/system_state.h"
+#if CONFIG_BITSTREAM_DEBUG
 #include "aom_util/debug_util.h"
+#endif  // CONFIG_BITSTREAM_DEBUG
 
 #if CONFIG_CLPF
 #include "av1/common/clpf.h"
diff --git a/av1/encoder/encoder.c b/av1/encoder/encoder.c
index a5dcfc6..56ba676 100644
--- a/av1/encoder/encoder.c
+++ b/av1/encoder/encoder.c
@@ -65,7 +65,9 @@
 #include "aom_ports/mem.h"
 #include "aom_ports/system_state.h"
 #include "aom_scale/aom_scale.h"
+#if CONFIG_BITSTREAM_DEBUG
 #include "aom_util/debug_util.h"
+#endif  // CONFIG_BITSTREAM_DEBUG
 
 #define AM_SEGMENT_ID_INACTIVE 7
 #define AM_SEGMENT_ID_ACTIVE 0