diff --git a/binary.cc b/binary.cc
index 2ac47195..90d72cfe 100644
--- a/binary.cc
+++ b/binary.cc
@@ -654,9 +654,9 @@ unsigned int read_journal(std::istream&	in,
   base_commodities = base_commodities_next = new commodity_t::base_t *[bc_count];
 
   for (commodity_t::ident_t i = 0; i < bc_count; i++) {
+#if 0
     commodity_t::base_t * base = read_commodity_base(data);
 
-#if 0
     // jww (2008-04-22): How does the pool get created here?
     amount_t::current_pool->commodities.push_back(commodity);
 
diff --git a/pyinterp.h b/pyinterp.h
index 3d69d972..897cf1d0 100644
--- a/pyinterp.h
+++ b/pyinterp.h
@@ -32,7 +32,7 @@
 #ifndef _PYINTERP_H
 #define _PYINTERP_H
 
-#include "xpath.h"
+#include "valexpr.h"
 
 #include <boost/python.hpp>
 #include <Python.h>
diff --git a/times.cc b/times.cc
index 45bd6659..b90f71aa 100644
--- a/times.cc
+++ b/times.cc
@@ -51,6 +51,7 @@ int current_year(current_moment.date().year());
 string input_time_format;
 string output_time_format = "%Y/%m/%d";
 
+#if 0
 static const char * formats[] = {
   "%Y/%m/%d",
   "%m/%d",
@@ -65,6 +66,7 @@ static const char * formats[] = {
   "%Y",
   NULL
 };
+#endif
 
 bool day_before_month = false;
 static bool  day_before_month_initialized = false;
@@ -136,8 +138,6 @@ datetime_t interval_t::first(const datetime_t& moment) const
 
 datetime_t interval_t::increment(const datetime_t& moment) const
 {
-  struct std::tm * desc = NULL;
-
 #if 0
   struct std::tm * desc = std::localtime(&moment.when);