diff --git a/eo/src/es/Makefile.am b/eo/src/es/Makefile.am
index 8c01cf15..b6b056fe 100644
--- a/eo/src/es/Makefile.am
+++ b/eo/src/es/Makefile.am
@@ -6,14 +6,42 @@
 
 INCLUDES = -I$(top_builddir)/src
 lib_LIBRARIES = libes.a
-libes_a_SOURCES = make_algo_scalar_real.cpp make_checkpoint_real.cpp  make_continue_real.cpp \
-make_genotype_real.cpp make_op_real.cpp make_pop_real.cpp make_run_real.cpp make_algo_scalar_es.cpp \
-make_checkpoint_es.cpp make_continue_es.cpp make_genotype_es.cpp make_op_es.cpp make_pop_es.cpp \
-make_run_es.cpp
+libes_a_SOURCES = make_algo_scalar_es.cpp \
+    make_algo_scalar_real.cpp \
+    make_checkpoint_es.cpp \
+    make_checkpoint_real.cpp \
+    make_continue_es.cpp \
+    make_continue_real.cpp \
+    make_genotype_es.cpp \
+    make_genotype_real.cpp \
+    make_op_es.cpp \
+    make_op_real.cpp \
+    make_pop_es.cpp \
+    make_pop_real.cpp \
+    make_run_es.cpp \
+    make_run_real.cpp
 
 CPPFLAGS = -Wall
 CXXFLAGS = 
 libeoincdir = $(includedir)/eo/es
-libeoinc_HEADERS = eoEsChromInit.h eoEsFull.h eoEsMutate.h eoEsMutationInit.h \
-eoEsSimple.h eoEsStdev.h eoNormalMutation.h eoReal.h eoRealOp.h eoEsGlobalXover.h \
-eoEsStandardXover.h eoRealAtomXover.h eoRealInitBounded.h eoSBXcross.h
+libeoinc_HEADERS = eoEsChromInit.h \
+    eoEsFull.h \
+    eoEsGlobalXover.h \
+    eoEsMutate.h \
+    eoEsMutationInit.h \
+    eoEsSimple.h \
+    eoEsStandardXover.h \
+    eoEsStdev.h \
+    eoNormalMutation.h \
+    eoRealAtomXover.h \
+    eoReal.h \
+    eoRealInitBounded.h \
+    eoRealOp.h \
+    eoSBXcross.h \
+    make_es.h \
+    make_genotype_real.h \
+    make_op_es.h \
+    make_op.h \
+    make_op_real.h \
+    make_real.h
+
diff --git a/eo/src/ga/Makefile.am b/eo/src/ga/Makefile.am
index 68d6194a..b06e9dcf 100644
--- a/eo/src/ga/Makefile.am
+++ b/eo/src/ga/Makefile.am
@@ -6,8 +6,26 @@
 
 INCLUDES = -I$(top_builddir)/src
 lib_LIBRARIES = libga.a
-libga_a_SOURCES = make_algo_scalar_ga.cpp make_checkpoint_ga.cpp make_continue_ga.cpp make_genotype_ga.cpp make_op_ga.cpp make_pop_ga.cpp make_run_ga.cpp
+libga_a_SOURCES = make_algo_scalar_ga.cpp \
+    make_checkpoint_ga.cpp \
+    make_continue_ga.cpp \
+    make_genotype_ga.cpp \
+    make_op_ga.cpp \
+    make_pop_ga.cpp \
+    make_run_ga.cpp
+
 CPPFLAGS = -Wall
 CXXFLAGS = 
 libeoincdir = $(includedir)/eo/ga
-libeoinc_HEADERS = eoBit.h eoBitOp.h eoBitOpFactory.h make_ga.h
+libeoinc_HEADERS = eoBit.h \
+    eoBitOpFactory.h \
+    eoBitOp.h \
+    eoBoolFlip.h \
+    eoPBILAdditive.h \
+    eoPBILDistrib.h \
+    eoPBILOrg.h \
+    make_ga.h \
+    make_genotype_ga.h \
+    make_op.h \
+    make_PBILdistrib.h \
+    make_PBILupdate.h
diff --git a/eo/src/gp/Makefile.am b/eo/src/gp/Makefile.am
index 1775610a..2de158c3 100644
--- a/eo/src/gp/Makefile.am
+++ b/eo/src/gp/Makefile.am
@@ -5,4 +5,10 @@
 ###############################################################################
 
 libeoincdir = $(includedir)/eo/gp
-libeoinc_HEADERS = eoParseTree.h  node_pool.h parse_tree.h eoParseTreeDepthInit.h eoParseTreeOp.h
+libeoinc_HEADERS = eoParseTreeDepthInit.h \
+    eoParseTree.h \
+    eoParseTreeOp.h \
+    eoStParseTreeDepthInit.h \
+    eoStParseTreeOp.h \
+    node_pool.h \
+    parse_tree.h