diff --git a/dirneucoupling.cc b/dirneucoupling.cc
index 0b72c666cd5002bb168ac44ec4319664db688966..ccde3e4d2aa5825eaeceb6fdd2082bdcadda4692 100644
--- a/dirneucoupling.cc
+++ b/dirneucoupling.cc
@@ -23,7 +23,7 @@
 #include <dune/ag-common/quadraticipopt.hh>
 #endif
 #include <dune/ag-common/readbitfield.hh>
-#include <dune/ag-common/energynorm.hh>
+#include <dune/ag-common/norm/energynorm.hh>
 #include <dune/ag-common/boundarypatch.hh>
 #include <dune/ag-common/prolongboundarypatch.hh>
 #include <dune/ag-common/sampleonbitfield.hh>
diff --git a/rod3d.cc b/rod3d.cc
index a9b7a6bace1cbdafeb4f01626ce1e7f594042d96..f1947c77efb20c568dfe316b22cf50321e9c1dd7 100644
--- a/rod3d.cc
+++ b/rod3d.cc
@@ -9,7 +9,7 @@
 
 
 #include <dune/ag-common/iterativesolver.hh>
-#include <dune/ag-common/energynorm.hh>
+#include <dune/ag-common/norm/energynorm.hh>
 
 #include "src/configuration.hh"
 #include "src/roddifference.hh"
diff --git a/src/rodsolver.cc b/src/rodsolver.cc
index 3cde69227b48d9d456a78e82945102e9232d090e..239b6e51c3155ab792e357f8e06f5cf7d30ae007 100644
--- a/src/rodsolver.cc
+++ b/src/rodsolver.cc
@@ -11,8 +11,8 @@
 #include <dune/ag-common/contactobsrestrict.hh>
 #include <dune/ag-common/iterativesolver.hh>
 
-#include <dune/ag-common/energynorm.hh>
-#include <dune/ag-common/h1seminorm.hh>
+#include <dune/ag-common/norm/energynorm.hh>
+#include <dune/ag-common/norm/h1seminorm.hh>
 
 #include "configuration.hh"
 #include "quaternion.hh"
diff --git a/src/rodsolver.hh b/src/rodsolver.hh
index 56ddf7f902f87f5c257f9086bf08a0473e51d8c8..06788d47ecda7aa3dc7b3d109fcfd84decdc8a54 100644
--- a/src/rodsolver.hh
+++ b/src/rodsolver.hh
@@ -7,7 +7,7 @@
 #include <dune/istl/bvector.hh>
 
 #include <dune/ag-common/boxconstraint.hh>
-#include <dune/ag-common/h1seminorm.hh>
+#include <dune/ag-common/norm/h1seminorm.hh>
 #include <dune/ag-common/iterativesolver.hh>
 
 #include "rodassembler.hh"
diff --git a/staticrod.cc b/staticrod.cc
index d706f549fda8d1fc0bdc84f3b48216e549e6c977..7199431420d573b708fad43714497239ce4a99bd 100644
--- a/staticrod.cc
+++ b/staticrod.cc
@@ -12,7 +12,7 @@
 #include <dune/ag-common/mmgstep.hh>
 #include <dune/ag-common/iterativesolver.hh>
 #include <dune/ag-common/geomestimator.hh>
-#include <dune/ag-common/energynorm.hh>
+#include <dune/ag-common/norm/energynorm.hh>
 #include <dune/ag-common/contactobsrestrict.hh>
 
 #include "src/rodwriter.hh"
diff --git a/staticrod2.cc b/staticrod2.cc
index 688ebf3fab942e57ab647786aa694538e7c90051..daec6753166be0669ffb82c52d35f2e990110c60 100644
--- a/staticrod2.cc
+++ b/staticrod2.cc
@@ -14,7 +14,7 @@
 #include <dune/ag-common/mmgstep.hh>
 #include <dune/ag-common/iterativesolver.hh>
 #include <dune/ag-common/geomestimator.hh>
-#include <dune/ag-common/energynorm.hh>
+#include <dune/ag-common/norm/energynorm.hh>
 #include <dune/ag-common/contactobsrestrict.hh>
 
 #include "src/rodwriter.hh"