Index: src/Todo.h
--- src/Todo.h.orig	2006-05-09 13:39:01 +0200
+++ src/Todo.h	2007-09-07 10:22:24 +0200
@@ -16,6 +16,7 @@
 
 class TodoDB;
 
+class TodoDB;
 class Todo {
 	public :
 		friend class TodoDB;
Index: src/todoterm.cc
--- src/todoterm.cc.orig	2007-06-28 15:04:36 +0200
+++ src/todoterm.cc	2007-09-07 10:22:24 +0200
@@ -15,13 +15,13 @@
 
 int getWidth() {
 	if (!term_initialized) {
-	char const *termtype = getenv("TERM");
+	char *termtype = getenv("TERM");
 		if (!termtype) {
 			cerr << "can't get terminal type, defaulting to vt100." << endl;
 			cerr << "please set the TERM env variable." << endl;
-			setenv("TERM", "vt100", 0);
+			termtype = "vt100";
 		}
-	int result = tgetent(info, getenv("TERM"));
+	int result = tgetent(info, termtype);
 		if (result < 0)
 			throw runtime_error("could not access termcap database");
 		if (result == 0)
Index: util/CommandArgs.cc
--- util/CommandArgs.cc.orig	2006-05-09 13:38:33 +0200
+++ util/CommandArgs.cc	2007-09-07 10:22:24 +0200
@@ -1,4 +1,5 @@
 #include "CommandArgs.h"
+#include <assert.h>
 CommandArgs::CommandArgs() {
 }
 
Index: util/Regex.h
--- util/Regex.h.orig	2007-06-28 14:24:00 +0200
+++ util/Regex.h	2007-09-07 10:23:30 +0200
@@ -8,6 +8,7 @@
 #include <utility>
 #include <stdexcept>
 #include <cassert>
+#include <assert.h>
 #include <sys/types.h>
 #include <regex.h>