diff --git a/eo/src/Makefile.am b/eo/src/Makefile.am
index 59bfd6c1..ae2e7497 100644
--- a/eo/src/Makefile.am
+++ b/eo/src/Makefile.am
@@ -8,13 +8,6 @@ SUBDIRS = es ga gp obsolete utils # other
 
 lib_LIBRARIES = libeo.a
 libeo_a_SOURCES = eoPrintable.cpp eoPersistent.cpp 
-libeo_a_LIBADD = obsolete/eoParserUtils.o utils/eoParser.o utils/eoRNG.o utils/eoState.o
 
 libeoincdir = $(includedir)/eo
-libeoinc_HEADERS = EO.h eoDup.h eoKill.h eoProportionalGOpSelector.h eoTournament.h eo1d.h eoEasyEA.h eoLottery.h eoProportionalOpSel.h eoTranspose.h eo1dWDistance.h eoEvalFunc.h eoMerge.h eoRandomBreed.h eoUniform.h eo2d.h eoEvalFuncPtr.h eoMutation.h eoRandomIndiSelector.h eoUniformSelect.h eo2dVector.h eoEvalFuncPtrCnt.h eoNegExp.h eoRandomSelect.h eoUniformXOver.h eoAlgo.h eoFactory.h eoNonUniform.h eoRank.h eoVector.h eoAtomBitFlip.h eoFitTerm.h eoNormal.h eoRnd.h eoWrappedOps.h eoAtomCreep.h eoFitness.h eoObject.h eoScalarFitness.h eoXOver2.h eoAtomMutation.h eoGOpBreeder.h eoOp.h eoScheme.h eoAtomMutator.h eoGOpSelector.h eoOpFactory.h eoSelectFactory.h eoBreeder.h eoID.h eoPersistent.h eoSteadyStateGeneration.h eoAtomRandom.h eoGenTerm.h eoOpSelMason.h eoSequentialGOpSelector.h eoBackInserter.h eoGeneration.h eoOpSelector.h eoSteadyStateEA.h eoDetTournament.h eoInclusion.h eoPop.h eoSteadyStateInserter.h eoDetTournamentIndiSelector.h eoIndiSelector.h eoPopOps.h eoStochTournament.h eoDetTournamentInserter.h eoInserter.h eoPrintable.h eoStochTournamentInserter.h eoDistance.h eoInsertion.h eoProportionalGOpSel.h eoTerm.h \
-	es/eoESFullChrom.h es/eoESChrom.h es/eoESFullMut.h \
-	ga/eoBin.h ga/eoBitOp.h ga/eoBitOpFactory.h \
-	gp/eoParseTree.h gp/node_pool.h gp/parse_tree.h \
-	obsolete/eoParser.h obsolete/eoParserUtils.h obsolete/eoProblem.h \
-	other/eoStringMutation.h other/eoExternalEO.h other/eoString.h \
-	utils/compatibility.h utils/eoData.h utils/eoParser.h utils/eoState.h utils/eoRNG.h utils/rnd_generators.h utils/selectors.h utils/eoParam.h
\ No newline at end of file
+libeoinc_HEADERS = EO.h eoDup.h eoKill.h eoProportionalGOpSelector.h eoTournament.h eo1d.h eoEasyEA.h eoLottery.h eoProportionalOpSel.h eoTranspose.h eo1dWDistance.h eoEvalFunc.h eoMerge.h eoRandomBreed.h eoUniform.h eo2d.h eoEvalFuncPtr.h eoMutation.h eoRandomIndiSelector.h eoUniformSelect.h eo2dVector.h eoEvalFuncPtrCnt.h eoNegExp.h eoRandomSelect.h eoUniformXOver.h eoAlgo.h eoFactory.h eoNonUniform.h eoRank.h eoVector.h eoAtomBitFlip.h eoFitTerm.h eoNormal.h eoRnd.h eoWrappedOps.h eoAtomCreep.h eoFitness.h eoObject.h eoScalarFitness.h eoXOver2.h eoAtomMutation.h eoGOpBreeder.h eoOp.h eoScheme.h eoAtomMutator.h eoGOpSelector.h eoOpFactory.h eoSelectFactory.h eoBreeder.h eoID.h eoPersistent.h eoSteadyStateGeneration.h eoAtomRandom.h eoGenTerm.h eoOpSelMason.h eoSequentialGOpSelector.h eoBackInserter.h eoGeneration.h eoOpSelector.h eoSteadyStateEA.h eoDetTournament.h eoInclusion.h eoPop.h eoSteadyStateInserter.h eoDetTournamentIndiSelector.h eoIndiSelector.h eoPopOps.h eoStochTournament.h eoDetTournamentInserter.h eoInserter.h eoPrintable.h eoStochTournamentInserter.h eoDistance.h eoInsertion.h eoProportionalGOpSel.h eoTerm.h
\ No newline at end of file
diff --git a/eo/test/Makefile.am b/eo/test/Makefile.am
index 580c1922..e1138811 100644
--- a/eo/test/Makefile.am
+++ b/eo/test/Makefile.am
@@ -4,13 +4,13 @@
 ##
 ###############################################################################
 
-DEPS = $(top_builddir)/src/libeo.a
+DEPS = $(top_builddir)/src/libeo.a $(top_builddir)/src/obsolete/libeoobsolete.a $(top_builddir)/src/utils/libeoutils.a
 EXTRA_DIST = LICENSE
 
 ###############################################################################
 
-INCLUDES = -I$(top_builddir)/src -I$(top_builddir)/src/ga -I$(top_builddir)/src/utils
-LDADDS = $(top_builddir)/src/libeo.a
+INCLUDES = -I$(top_builddir)/src -I$(top_builddir)/src/es -I$(top_builddir)/src/ga -I$(top_builddir)/src/gp -I$(top_builddir)/src/obsolete -I$(top_builddir)/src/utils
+LDADDS = $(top_builddir)/src/libeo.a $(top_builddir)/src/obsolete/libeoobsolete.a $(top_builddir)/src/utils/libeoutils.a
 
 ###############################################################################
 
diff --git a/eo/test/Makefile.in b/eo/test/Makefile.in
index 95304ceb..554fe6ea 100644
--- a/eo/test/Makefile.in
+++ b/eo/test/Makefile.in
@@ -77,13 +77,13 @@ PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
 VERSION = @VERSION@
 
-DEPS = $(top_builddir)/src/libeo.a
+DEPS = $(top_builddir)/src/libeo.a $(top_builddir)/src/obsolete/libeoobsolete.a $(top_builddir)/src/utils/libeoutils.a
 EXTRA_DIST = LICENSE
 
 ###############################################################################
 
-INCLUDES = -I$(top_builddir)/src -I$(top_builddir)/src/ga -I$(top_builddir)/src/utils
-LDADDS = $(top_builddir)/src/libeo.a
+INCLUDES = -I$(top_builddir)/src -I$(top_builddir)/src/es -I$(top_builddir)/src/ga -I$(top_builddir)/src/gp -I$(top_builddir)/src/obsolete -I$(top_builddir)/src/utils
+LDADDS = $(top_builddir)/src/libeo.a $(top_builddir)/src/obsolete/libeoobsolete.a $(top_builddir)/src/utils/libeoutils.a
 
 ###############################################################################