diff --git a/amount.cc b/amount.cc
index f1ab9c6c..3417986c 100644
--- a/amount.cc
+++ b/amount.cc
@@ -2,6 +2,7 @@
 #include "binary.h"
 #include "error.h"
 #include "util.h"
+#include "debug.h"
 
 #include <deque>
 
diff --git a/debug.h b/debug.h
index 2c483cca..3938bafe 100644
--- a/debug.h
+++ b/debug.h
@@ -104,6 +104,8 @@ bool _debug_active(const char * const cls);
 #define DEBUG_() 0
 #define DEBUG_PRINT(cls, x)
 #define DEBUG_PRINT_(x)
+#define DEBUG_PRINT_TIME(cls, x)
+#define DEBUG_PRINT_TIME_(x)
 
 #define VALIDATE(x)
 
diff --git a/format.cc b/format.cc
index 44307d05..4bbce62b 100644
--- a/format.cc
+++ b/format.cc
@@ -184,7 +184,7 @@ void format_t::format_elements(std::ostream&    out,
     case element_t::VALUE:
     case element_t::TOTAL:
     case element_t::VALUE_EXPR: {
-      value_expr_t * expr;
+      value_expr_t * expr = NULL;
       switch (elem->type) {
 #ifdef NO_CLEANUP
       case element_t::VALUE: expr = value_expr; break;
diff --git a/quotes.cc b/quotes.cc
index 771fd790..8f27f01e 100644
--- a/quotes.cc
+++ b/quotes.cc
@@ -1,5 +1,6 @@
 #include "quotes.h"
 #include "datetime.h"
+#include "debug.h"
 
 #include <fstream>
 
diff --git a/value.h b/value.h
index dd9ae375..d553eb9e 100644
--- a/value.h
+++ b/value.h
@@ -3,6 +3,7 @@
 
 #include "amount.h"
 #include "balance.h"
+#include "debug.h"
 
 namespace ledger {