diff --git a/src/Makefile.am b/src/Makefile.am
index 2d643b78..3b1cb5a1 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -18,7 +18,7 @@ EXTRA_DIST=\
 	phreeqcpp/Form1.resX\
 	phreeqcpp/ZedGraph.dll	
 
-AM_CPPFLAGS=-I$(top_srcdir)/src -I$(top_srcdir)/src/phreeqcpp
+AM_CPPFLAGS=-I$(top_srcdir)/src -I$(top_srcdir)/src/phreeqcpp -I$(top_srcdir)/src/phreeqcpp/PhreeqcKeywords
 
 AM_LDFLAGS=-release 3.0.0
 
@@ -68,8 +68,6 @@ libiphreeqc_la_SOURCES=\
 	phreeqcpp/ISolutionComp.cxx\
 	phreeqcpp/ISolutionComp.h\
 	phreeqcpp/isotopes.cpp\
-	phreeqcpp/Keywords.cpp\
-	phreeqcpp/Keywords.h\
 	phreeqcpp/kinetics.cpp\
 	phreeqcpp/KineticsComp.cxx\
 	phreeqcpp/KineticsComp.h\
@@ -93,6 +91,8 @@ libiphreeqc_la_SOURCES=\
 	phreeqcpp/phqalloc.h\
 	phreeqcpp/Phreeqc.cpp\
 	phreeqcpp/Phreeqc.h\
+	phreeqcpp/PhreeqcKeywords/Keywords.cpp\
+	phreeqcpp/PhreeqcKeywords/Keywords.h\
 	phreeqcpp/PHRQ_base.cxx\
 	phreeqcpp/PHRQ_base.h\
 	phreeqcpp/PHRQ_io.cpp\
@@ -171,7 +171,7 @@ include_HEADERS=\
 	$(top_srcdir)/src/IPhreeqcCallbacks.h\
 	$(top_srcdir)/src/Var.h\
 	$(top_srcdir)/src/phreeqcpp/PHRQ_io.h\
-	$(top_srcdir)/src/phreeqcpp/Keywords.h
+	$(top_srcdir)/src/phreeqcpp/PhreeqcKeywords/Keywords.h
 
 
 if BUILD_FORTRAN
diff --git a/tests/Makefile.am b/tests/Makefile.am
index f6a0717b..738dea30 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,6 +1,6 @@
 EXTRA_DIST = test_c.vcproj test_cxx.vcproj test_f90.vfproj test_f.vfproj main77.f main.f90
 
-AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/src/phreeqcpp
+AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/src/phreeqcpp -I$(top_srcdir)/src/phreeqcpp/PhreeqcKeywords
 AM_FCFLAGS = -I$(top_srcdir)/src
 AM_FFLAGS = -I$(top_srcdir)/src