--- util/Lexer.h.orig	2006-05-09 06:38:33.000000000 -0500
+++ util/Lexer.h	2010-04-07 04:20:22.000000000 -0500
@@ -6,7 +6,7 @@
 #include <map>
 #include <iterator>
 #include "Strings.h"
-#include "Regex.h"
+#include "DTRegex.h"
 
 using namespace std;
 
--- util/Makefile.in.orig	2007-06-29 21:47:21.000000000 -0500
+++ util/Makefile.in	2010-04-07 04:20:14.000000000 -0500
@@ -182,7 +182,7 @@
 top_srcdir = @top_srcdir@
 noinst_LTLIBRARIES = libutil.la
 libutil_la_SOURCES = Terminal.cc Terminal.h Lexer.cc Lexer.h \
-	Regex.cc Regex.h XML.cc XML.h Strings.cc Strings.h CommandArgs.cc CommandArgs.h
+	Regex.cc DTRegex.h XML.cc XML.h Strings.cc Strings.h CommandArgs.cc CommandArgs.h
 
 all: all-am
 
--- util/Regex.cc.orig	2006-05-09 06:38:33.000000000 -0500
+++ util/Regex.cc	2010-04-07 04:19:59.000000000 -0500
@@ -1,4 +1,4 @@
-#include "Regex.h"
+#include "DTRegex.h"
 //map<string, Regex::Cache> Regex::cache;
 
 Regex::Regex()
