Index: src/apache-2/Makefile.am
===================================================================
--- src/apache-2/Makefile.am	(revision 584720)
+++ src/apache-2/Makefile.am	(working copy)
@@ -21,7 +21,7 @@
 apxs_libexecdir = @APXS_LIBEXECDIR@
 apxs_libexec_LTLIBRARIES = mod_rivet.la
 
-INCLUDES = -I@apache_include@ -I@RIVET_BASE_INCLUDE@ 
+INCLUDES = -I"." -I@apache_include@ -I@RIVET_BASE_INCLUDE@ 
 
 # ... and these two.  We want to put the libs in the package path,
 # rather than the standard library location for the system.
@@ -33,11 +33,11 @@
 #
 mod_rivet_la_SOURCES = apache_multipart_buffer.c \
 	apache_request.c	\
-	../rivetChannel.c \
-	../rivetParser.c \
 	rivetCore.c	\
 	mod_rivet.c \
-	TclWebapache.c 
+	TclWebapache.c  \
+	../rivetChannel.c \
+	../rivetParser.c 
 
 ##mod_rivet_la_SOURCES = mod_rivet.c mod_rivet.h