misc cleanup

7 files changed, 11 insertions, 11 deletions

diff --git a/Makefile b/Makefile
index 84c6a360..2f5eaa65 100644
--- a/Makefile
+++ b/Makefile
@@ -21,9 +21,9 @@ OBJS   = $(patsubst %.cc,%.o,$(CODE))
 CXX    = g++
 
 CFLAGS = -Wall -ansi -pedantic
-#DFLAGS = -O3 -fomit-frame-pointer -DRELEASE_LEVEL=0 -DNO_CLEANUP
-DFLAGS = -g -DRELEASE_LEVEL=4 -DNO_CLEANUP
-#DFLAGS = -g -DRELEASE_LEVEL=2 -pg -DNO_CLEANUP
+#DFLAGS = -O3 -fomit-frame-pointer -DRELEASE_LEVEL=0
+DFLAGS = -g -DRELEASE_LEVEL=4
+#DFLAGS = -g -DRELEASE_LEVEL=2 -pg
 
 INCS   = -I/sw/include \
 	 -I/usr/include/gcc/darwin/3.3/c++ \
diff --git a/amount.cc b/amount.cc
index c2bc6465..b1cde175 100644
--- a/amount.cc
+++ b/amount.cc
@@ -1,4 +1,4 @@
-#include "ledger.h"
+#include "amount.h"
 
 #include "gmp.h"
 
diff --git a/balance.cc b/balance.cc
index 7ecdab4e..f5340195 100644
--- a/balance.cc
+++ b/balance.cc
@@ -1,4 +1,4 @@
-#include "ledger.h"
+#include "balance.h"
 
 namespace ledger {
 
diff --git a/binary.cc b/binary.cc
index 1f0fc106..9bdfac67 100644
--- a/binary.cc
+++ b/binary.cc
@@ -1,5 +1,4 @@
 #include "ledger.h"
-#include "debug.h"
 
 #include <vector>
 #include <fstream>
diff --git a/debug.cc b/debug.cc
index ab073894..02613210 100644
--- a/debug.cc
+++ b/debug.cc
@@ -102,4 +102,4 @@ static struct init_streams {
 
 } // namespace ledger
 
-#endif DEBUG_ENABLED
+#endif // DEBUG_ENABLED
diff --git a/ledger.h b/ledger.h
index 885e451a..e645860a 100644
--- a/ledger.h
+++ b/ledger.h
@@ -16,15 +16,17 @@
 #include <ctime>
 #include <iostream>
 
-#include "amount.h"
-#include "balance.h"
-
 #ifdef RELEASE_LEVEL
 #if RELEASE_LEVEL >= 2
 #include "debug.h"
+#elif RELEASE_LEVEL == 0
+#define NO_CLEANUP 1
 #endif
 #endif
 
+#include "amount.h"
+#include "balance.h"
+
 namespace ledger {
 
 // These flags persist with the object
diff --git a/valexpr.cc b/valexpr.cc
index 2f83a033..cd6664b1 100644
--- a/valexpr.cc
+++ b/valexpr.cc
@@ -1,7 +1,6 @@
 #include "valexpr.h"
 #include "error.h"
 #include "datetime.h"
-#include "debug.h"
 
 #include <vector>