diff --git a/Makefile.am b/Makefile.am
index 58fdab7..42ca395 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -192,6 +192,7 @@ libqsopt_ex_la_CFLAGS = \
 libqsopt_ex_la_LDFLAGS = \
 	-no-undefined \
 	-version-info $(LT_VERSION_INFO) \
+	-export-symbols-regex "^(QS|dbl_QS|mpq_QS|mpf_QS|EGio|mpq_ILL_MAXDOUBLE|mpq_ILL_MINDOUBLE)" \
 	$(AM_LDFLAGS)
 libqsopt_ex_la_LIBADD = $(GMP_LIBS)
 
@@ -212,11 +213,18 @@ tests_test_qs_SOURCES = tests/test_qs.c
 tests_test_qs_CFLAGS = $(AM_CFLAGS) $(GMP_CFLAGS)
 tests_test_qs_LDADD = $(GMP_LIBS) libqsopt_ex.la
 
-tests_eg_sloan_SOURCES = tests/eg_sloan.c tests/eg_sloan.h
+tests_eg_sloan_SOURCES = \
+	tests/eg_sloan.c tests/eg_sloan.h \
+	qsopt_ex/eg_exutil.c \
+	qsopt_ex/eg_lpnum.c \
+	qsopt_ex/eg_memslab.c
 tests_eg_sloan_CFLAGS = $(AM_CFLAGS) $(GMP_CFLAGS)
 tests_eg_sloan_LDADD = $(GMP_LIBS) libqsopt_ex.la
 
-esolver_esolver_SOURCES = esolver/esolver.c
+esolver_esolver_SOURCES = \
+	esolver/esolver.c \
+	qsopt_ex/bgetopt.c \
+	qsopt_ex/zeit.c
 esolver_esolver_CFLAGS = $(AM_CFLAGS) $(GMP_CFLAGS)
 esolver_esolver_LDADD = $(GMP_LIBS) libqsopt_ex.la
 
diff --git a/esolver/esolver.c b/esolver/esolver.c
index 6694518..01ab1cf 100644
--- a/esolver/esolver.c
+++ b/esolver/esolver.c
@@ -31,9 +31,10 @@
 
 #include "QSopt_ex.h"
 
+#include "bgetopt.h"
 #include "except.h"
 #include "logging-private.h"
-#include "qs_config.h"
+#include "zeit.h"
 
 /* ========================================================================= */
 /** @name static parameters for the main program */
diff --git a/qsopt_ex/QSopt_ex.h b/qsopt_ex/QSopt_ex.h
index 9bea725..8e0cfd1 100644
--- a/qsopt_ex/QSopt_ex.h
+++ b/qsopt_ex/QSopt_ex.h
@@ -21,94 +21,11 @@
 #ifndef QSOPT_EX_H
 #define QSOPT_EX_H
 
-#include "eg_elist.h"
-#include "eg_io.h"
-#include "eg_lpnum.h"
-#include "eg_macros.h"
-#include "eg_mem.h"
-#include "eg_memslab.h"
-
-#include "eg_lpnum.dbl.h"
-#include "eg_lpnum.mpf.h"
-#include "eg_lpnum.mpq.h"
-
-#include "basicdefs.h"
-#include "urandom.h"
-#include "symtab.h"
-#include "reporter.h"
-#include "bgetopt.h"
-#include "zeit.h"
+#include "exact.h"
 #include "logging.h"
-
-#include "QSopt_ex_version.h"
-
-/* Double template headers */
-#include "qstruct_dbl.h"
-#include "editor_dbl.h"
-#include "dstruct_dbl.h"
-#include "factor_dbl.h"
-#include "lpdefs_dbl.h"
-#include "readline_dbl.h"
-#include "lpdata_dbl.h"
-#include "basis_dbl.h"
-#include "dheaps_i_dbl.h"
 #include "qsopt_dbl.h"
-#include "format_dbl.h"
-#include "price_dbl.h"
-#include "priority_dbl.h"
-#include "ratio_dbl.h"
-#include "read_lp_dbl.h"
-#include "read_mps_dbl.h"
-#include "simplex_dbl.h"
-#include "write_lp_dbl.h"
-#include "lib_dbl.h"
-#include "eg_numutil_dbl.h"
-
-/* MPQ template headers */
-#include "qstruct_mpq.h"
-#include "editor_mpq.h"
-#include "dstruct_mpq.h"
-#include "factor_mpq.h"
-#include "lpdefs_mpq.h"
-#include "readline_mpq.h"
-#include "lpdata_mpq.h"
-#include "basis_mpq.h"
-#include "dheaps_i_mpq.h"
 #include "qsopt_mpq.h"
-#include "format_mpq.h"
-#include "price_mpq.h"
-#include "priority_mpq.h"
-#include "ratio_mpq.h"
-#include "read_lp_mpq.h"
-#include "read_mps_mpq.h"
-#include "simplex_mpq.h"
-#include "write_lp_mpq.h"
-#include "lib_mpq.h"
-#include "eg_numutil_mpq.h"
-
-/* MPF template headers */
-#include "qstruct_mpf.h"
-#include "editor_mpf.h"
-#include "dstruct_mpf.h"
-#include "factor_mpf.h"
-#include "lpdefs_mpf.h"
-#include "readline_mpf.h"
-#include "lpdata_mpf.h"
-#include "basis_mpf.h"
-#include "dheaps_i_mpf.h"
 #include "qsopt_mpf.h"
-#include "format_mpf.h"
-#include "price_mpf.h"
-#include "priority_mpf.h"
-#include "ratio_mpf.h"
-#include "read_lp_mpf.h"
-#include "read_mps_mpf.h"
-#include "simplex_mpf.h"
-#include "write_lp_mpf.h"
-#include "lib_mpf.h"
-#include "eg_numutil_mpf.h"
-
-#include "exact.h"
-#include "eg_exutil.h"
+#include "QSopt_ex_version.h"
 
 #endif /* !QSOPT_EX_H */
diff --git a/qsopt_ex/bgetopt.c b/qsopt_ex/bgetopt.c
index 3ba4564..925bec8 100644
--- a/qsopt_ex/bgetopt.c
+++ b/qsopt_ex/bgetopt.c
@@ -58,10 +58,9 @@
 #include <stdio.h>
 #include <stdlib.h>
 
+#include "bgetopt.h"
 #include "logging-private.h"
 
-#include "util.h"
-
 
 int ILLutil_bix_getopt (
 	int ac,
diff --git a/qsopt_ex/util.h b/qsopt_ex/util.h
index f6021b7..1ba420c 100644
--- a/qsopt_ex/util.h
+++ b/qsopt_ex/util.h
@@ -146,7 +146,6 @@ double ILLutil_our_floor (
 	double *v,
 	int len);
 
-#include "bgetopt.h"
 /*#include "dheaps_i.h"*/
 /*#include "priority.h"*/
 #endif /* ILL_UTIL_H */
diff --git a/tests/eg_sloan.c b/tests/eg_sloan.c
index 38e7833..b667dc9 100644
--- a/tests/eg_sloan.c
+++ b/tests/eg_sloan.c
@@ -7,10 +7,13 @@
 #include <stdio.h>
 #include <unistd.h>
 
-#include "qs_config.h"
+#include "QSopt_ex.h"
+
+#include "eg_exutil.h"
+#include "eg_lpnum.mpq.h"
 #include "logging-private.h"
+#include "qs_config.h"
 
-#include "QSopt_ex.h"
 /* ========================================================================= */
 /** @name Static Variables
  * Set of static variables for this program. */