diff --git a/src/Makefile.am b/src/Makefile.am
index d5647434ed71192049a79e627079b7d2bcb81472..3b07f3e5f1531a944e26015f8ed2e8c010e6a6e1 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -25,6 +25,7 @@ run-one-body-sample-gdb: one-body-sample
 one_body_sample_SOURCES = \
 	assemblers.cc \
 	compute_state.cc \
+	mysolver.cc \
 	one-body-sample.cc \
 	print.cc \
 	vtk.cc
diff --git a/src/mysolver.cc b/src/mysolver.cc
index 7606e56da35168d8a65e2fd403e52dec9bdd8078..33c5fd20bacb9ffe0c0f734055840a509d7e56bb 100644
--- a/src/mysolver.cc
+++ b/src/mysolver.cc
@@ -62,4 +62,4 @@ MySolver<dim, VectorType, OperatorType, GridType,
   return multigridStep;
 }
 
-//#include "mysolver_tmpl.cc"
+#include "mysolver_tmpl.cc"
diff --git a/src/one-body-sample.cc b/src/one-body-sample.cc
index 0ce37e0404755d64fe4df1f3292a364b7e118d99..621639a9641a6180fd2b07fb6106af72ab75361b 100644
--- a/src/one-body-sample.cc
+++ b/src/one-body-sample.cc
@@ -2,6 +2,10 @@
 #include "config.h"
 #endif
 
+#ifdef HAVE_IPOPT
+#undef HAVE_IPOPT
+#endif
+
 #ifndef srcdir
 #error srcdir unset
 #endif
@@ -51,7 +55,7 @@
 
 #include "assemblers.hh"
 #include "compute_state.hh"
-#include "mysolver.cc" // TODO
+#include "mysolver.hh"
 #include "print.hh"
 #include "vtk.hh"