diff --git a/dune/tectonic/octave/duneoctave.hh b/dune/tectonic/octave/duneoctave.hh
index 6857f2c2255dfcfb5c95c6c30482f299da3969af..902306a7f9ea5fab76fa4254aec27abb6b2cbbd6 100644
--- a/dune/tectonic/octave/duneoctave.hh
+++ b/dune/tectonic/octave/duneoctave.hh
@@ -1,11 +1,11 @@
 /* -*- mode:c++; mode:semantic -*- */
 
-#ifndef DUNE_OCTAVE_HH
-#define DUNE_OCTAVE_HH
+#ifndef DUNE_TECTONIC_OCTAVE_DUNEOCTAVE_HH
+#define DUNE_TECTONIC_OCTAVE_DUNEOCTAVE_HH
 
 #include <octave/oct.h>
 
-#include "samplefunctional.hh"
+#include <dune/tectonic/samplefunctional.hh>
 
 #include <cassert>
 
diff --git a/src/Makefile.am b/src/Makefile.am
index 139922b27a5bba14be521efa7b40eb38fc41ac43..708ae1a988e119d861c7f764db24d33b5ba6ecc3 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -18,10 +18,7 @@ test_python_SOURCES = \
 	test-python.cc
 
 test_gradient_method_SOURCES = \
-	test-gradient-method.cc \
-	mynonlinearity.hh \
-	nicefunction.hh \
-	samplefunctional.hh
+	test-gradient-method.cc
 
 TESTS= test-python test-gradient-method
 
@@ -39,7 +36,8 @@ AM_CXXFLAGS = \
 AM_CPPFLAGS = \
 	$(DUNE_CPPFLAGS) \
 	$(ALUGRID_CPPFLAGS) \
-	$(PYTHON_CPPFLAGS)
+	$(PYTHON_CPPFLAGS) \
+	-I$(top_srcdir)
 
 # The libraries have to be given in reverse order (most basic libraries
 # last).  Also, due to some misunderstanding, a lot of libraries include the
diff --git a/src/duneevaluate.cc b/src/duneevaluate.cc
index a6cb3ac77d1da282a8c0b2cbbcd99ec24656c6c7..9db4a2f59dfa84537d970bc95585cd5f76d18ccf 100644
--- a/src/duneevaluate.cc
+++ b/src/duneevaluate.cc
@@ -6,8 +6,8 @@
 #include "config.h"
 #endif
 
-#include "samplefunctional.hh"
-#include "duneoctave.hh"
+#include <dune/tectonic/octave/duneoctave.hh>
+#include <dune/tectonic/samplefunctional.hh>
 
 #include <cassert>
 
diff --git a/src/duneminimise.cc b/src/duneminimise.cc
index 01ed50510ed973749752e5a8a3df205d1b7f9bbe..39ab3dd0d07fc6faaa6eed06c364574365d93d00 100644
--- a/src/duneminimise.cc
+++ b/src/duneminimise.cc
@@ -6,8 +6,8 @@
 #include "config.h"
 #endif
 
-#include "samplefunctional.hh"
-#include "duneoctave.hh"
+#include <dune/tectonic/octave/duneoctave.hh>
+#include <dune/tectonic/samplefunctional.hh>
 
 #include <cassert>
 
diff --git a/src/octave.mk b/src/octave.mk
index 673fbdcf518e90b5a4d9ba1c51bd004d0e94d3e8..9d41dbdcb1a778b3f9c0e4188b984a97eabbff9e 100644
--- a/src/octave.mk
+++ b/src/octave.mk
@@ -1,7 +1,7 @@
 $(OCTAVE_MODULES): %.oct: %.o
 	$(MKOCTFILE) -o $@ $< -ldunecommon
 
-$(OCTAVE_MODULES:.oct=.o): %.o: %.cc duneoctave.hh
+$(OCTAVE_MODULES:.oct=.o): %.o: %.cc
 	$(MKOCTFILE) $(DEFS) $(AM_CPPFLAGS) -c -o $@ $<
 
 CLEANFILES = $(OCTAVE_MODULES) $(OCTAVE_MODULES:.oct=.o)
diff --git a/src/one-body-sample.cc b/src/one-body-sample.cc
index 2d849a5569ac14f2453870de324956b6a6c7e601..bd65ccb79b2e514ebef91d362a97eeac9597de62 100644
--- a/src/one-body-sample.cc
+++ b/src/one-body-sample.cc
@@ -35,8 +35,8 @@
 #include <exception>
 #include <iostream>
 
-#include "myconvexproblem.hh"
-#include "myblockproblem.hh"
+#include <dune/tectonic/myconvexproblem.hh>
+#include <dune/tectonic/myblockproblem.hh>
 
 int const dim = 2;
 
diff --git a/src/test-gradient-method.cc b/src/test-gradient-method.cc
index 4c99a47edd7f327def19ff1b469062fd6ea70971..92253a8185e148b14319c89866bd2c965689fcbe 100644
--- a/src/test-gradient-method.cc
+++ b/src/test-gradient-method.cc
@@ -7,7 +7,7 @@
 #include <dune/common/exceptions.hh>
 #include <dune/common/stdstreams.hh>
 
-#include "samplefunctional.hh"
+#include <dune/tectonic/samplefunctional.hh>
 
 #include <cassert>