diff --git a/dune.module b/dune.module
index 3ac7b475b0683df3b02121e81ed3569ccb542700..991746b636abef60f08d304ab9f146ef6331f4b4 100644
--- a/dune.module
+++ b/dune.module
@@ -7,5 +7,5 @@ Module: dune-vtk
 Version: 0.2
 Maintainer: simon.praetorius@tu-dresden.de
 #depending on
-Depends: dune-common (>= 2.6) dune-geometry (>= 2.6) dune-grid dune-uggrid
-Suggests: dune-functions dune-spgrid dune-polygongrid dune-alugrid dune-foamgrid
+Depends: dune-grid (>= 2.6)
+Suggests: dune-functions dune-spgrid dune-polygongrid dune-alugrid dune-foamgrid dune-uggrid
diff --git a/dune/vtk/datacollectors/test/test-lagrangedatacollector.cc b/dune/vtk/datacollectors/test/test-lagrangedatacollector.cc
index 32d6870db952f757fd1aecd6cee108ba1cc3e625..9079935ce261ebbd994397fdb3478eec63a6c9c9 100644
--- a/dune/vtk/datacollectors/test/test-lagrangedatacollector.cc
+++ b/dune/vtk/datacollectors/test/test-lagrangedatacollector.cc
@@ -10,7 +10,7 @@
 #include <dune/common/test/testsuite.hh>
 
 #include <dune/grid/yaspgrid.hh>
-#if HAVE_UG
+#if HAVE_DUNE_UGGRID
   #include <dune/grid/uggrid.hh>
 #endif
 
@@ -107,7 +107,7 @@ int main(int argc, char** argv)
   testGrid("yaspgrid_2d", testSuite, yaspGrid2);
   testGrid("yaspgrid_3d", testSuite, yaspGrid3);
 
-#if HAVE_UG
+#if HAVE_DUNE_UGGRID
   auto ugGrid2 = StructuredGridFactory<UGGrid<2>>::createSimplexGrid({0.0,0.0}, {1.0,1.0}, {1u,1u});
   auto ugGrid3 = StructuredGridFactory<UGGrid<3>>::createSimplexGrid({0.0,0.0,0.0}, {1.0,1.0,1.0}, {1u,1u,1u});
 
diff --git a/dune/vtk/test/test-typededuction.cc b/dune/vtk/test/test-typededuction.cc
index 23baf7ec93ad85bd0da53a70630d023bb3310393..8305fb343068901ed96a875498b1b17445cf49bc 100644
--- a/dune/vtk/test/test-typededuction.cc
+++ b/dune/vtk/test/test-typededuction.cc
@@ -8,7 +8,7 @@
 #include <dune/vtk/vtkreader.hh>
 #include <dune/vtk/vtkwriter.hh>
 
-#if HAVE_UG
+#if HAVE_DUNE_UGGRID
   #include <dune/grid/uggrid.hh>
   using GridType = Dune::UGGrid<2>;
 #else
diff --git a/dune/vtk/test/test-vtkwriter.cc b/dune/vtk/test/test-vtkwriter.cc
index 721b61366a41c206c976dfaac266461348a89f9e..71bd4bc68b378e780363d2e15ce152bc8e6088a1 100644
--- a/dune/vtk/test/test-vtkwriter.cc
+++ b/dune/vtk/test/test-vtkwriter.cc
@@ -16,7 +16,7 @@
 #include <dune/common/parallel/mpihelper.hh>
 #include <dune/functions/gridfunctions/analyticgridviewfunction.hh>
 #include <dune/grid/yaspgrid.hh>
-#if HAVE_UG
+#if HAVE_DUNE_UGGRID
   #include <dune/grid/uggrid.hh>
   #include <dune/grid/utility/structuredgridfactory.hh>
 #endif
@@ -116,7 +116,7 @@ int main (int argc, char** argv)
   acc(result, testGrid("yaspgrid_2d", vtkChecker, yaspGrid2));
   acc(result, testGrid("yaspgrid_3d", vtkChecker, yaspGrid3));
 
-#if HAVE_UG
+#if HAVE_DUNE_UGGRID
   auto ugGrid2a = StructuredGridFactory<UGGrid<2>>::createSimplexGrid({0.0,0.0}, {1.0,2.0}, {2u,4u});
   auto ugGrid3a = StructuredGridFactory<UGGrid<3>>::createSimplexGrid({0.0,0.0,0.0}, {1.0,2.0,3.0}, {2u,4u,6u});
 
diff --git a/src/benchmark.cc b/src/benchmark.cc
index 32a3babc84375e83c3a749e3222aac40e8500bbc..1e519b995c3708a2d25f1f3f13406bfc5c46c8dd 100644
--- a/src/benchmark.cc
+++ b/src/benchmark.cc
@@ -13,7 +13,10 @@
 #include <dune/common/filledarray.hh>
 #include <dune/common/timer.hh>
 
+#if HAVE_DUNE_UGGRID
 #include <dune/grid/uggrid.hh>
+#endif
+
 #include <dune/grid/yaspgrid.hh>
 #include <dune/grid/io/file/vtk.hh>
 #include <dune/grid/utility/structuredgridfactory.hh>
diff --git a/src/datacollector.cc b/src/datacollector.cc
index c342a24a2fe1c067459cb0aa5b750a737c40e334..177288eca7eb9a5cfcfb4662c65f18599b419ce9 100644
--- a/src/datacollector.cc
+++ b/src/datacollector.cc
@@ -19,7 +19,7 @@
 #include <dune/functions/gridfunctions/analyticgridviewfunction.hh>
 #include <dune/functions/gridfunctions/discreteglobalbasisfunction.hh>
 
-#if HAVE_UG
+#if HAVE_DUNE_UGGRID
 #include <dune/grid/uggrid.hh>
 #endif
 
@@ -98,7 +98,7 @@ int main(int argc, char** argv)
     write("datacollector_yasp", grid.leafGridView());
   });
 
-#if HAVE_UG
+#if HAVE_DUNE_UGGRID
   Hybrid::forEach(StaticIntegralRange<int,4,2>{}, [](auto dim)
   {
     using GridType = UGGrid<dim.value>;
diff --git a/src/legacyvtkwriter.cc b/src/legacyvtkwriter.cc
index a5838f409e43e23814f19fd48699b7712448a45b..0024694d413c331824670983222513ad340493d1 100644
--- a/src/legacyvtkwriter.cc
+++ b/src/legacyvtkwriter.cc
@@ -12,7 +12,6 @@
 #include <dune/common/exceptions.hh> // We use exceptions
 #include <dune/common/filledarray.hh>
 
-#include <dune/grid/uggrid.hh>
 #include <dune/grid/yaspgrid.hh>
 
 #include <dune/vtk/writers/vtkunstructuredgridwriter.hh>
diff --git a/src/structuredgridwriter.cc b/src/structuredgridwriter.cc
index 2521f58992b285b7a82087be3b583e0990e71d73..1704d5c54cf44c762f2d70ccd1cafc1db8aad321 100644
--- a/src/structuredgridwriter.cc
+++ b/src/structuredgridwriter.cc
@@ -17,7 +17,6 @@
 #include <dune/functions/functionspacebases/interpolate.hh>
 #include <dune/functions/gridfunctions/analyticgridviewfunction.hh>
 #include <dune/functions/gridfunctions/discreteglobalbasisfunction.hh>
-#include <dune/grid/uggrid.hh>
 #include <dune/grid/yaspgrid.hh>
 
 #include <dune/vtk/writers/vtkimagedatawriter.hh>
diff --git a/src/test/mixed_element_test.cc b/src/test/mixed_element_test.cc
index 6dbd9e104eb2ad5b7d7d99c0e6d07a6e00adf77e..2342c44a09bcd618e2cdc1c7ec7adda645bd6adb 100644
--- a/src/test/mixed_element_test.cc
+++ b/src/test/mixed_element_test.cc
@@ -13,7 +13,7 @@
 #include <dune/common/filledarray.hh>
 #include <dune/common/test/testsuite.hh>
 
-#if HAVE_UG
+#if HAVE_DUNE_UGGRID
 #include <dune/grid/uggrid.hh>
 #endif
 
diff --git a/src/test/parallel_reader_writer_test.cc b/src/test/parallel_reader_writer_test.cc
index d46d1371595ffd3dfded11c20ff611791db996bb..ad523f7cbd3d9d7372d90d0da7cdee07fb7bce37 100644
--- a/src/test/parallel_reader_writer_test.cc
+++ b/src/test/parallel_reader_writer_test.cc
@@ -14,7 +14,7 @@
 #include <dune/common/std/type_traits.hh>
 #include <dune/common/test/testsuite.hh>
 
-#if HAVE_UG
+#if HAVE_DUNE_UGGRID
 #include <dune/grid/uggrid.hh>
 #endif
 
@@ -181,7 +181,7 @@ int main (int argc, char** argv)
 
   TestSuite test{};
 
-#if HAVE_UG
+#if HAVE_DUNE_UGGRID
   reader_writer_test<UGGrid<2>, Vtk::SerialGridCreator<UGGrid<2>>>(mpi, test, "UGGrid<2>");
   reader_writer_test<UGGrid<3>, Vtk::SerialGridCreator<UGGrid<3>>>(mpi, test, "UGGrid<3>");
 #endif
diff --git a/src/test/reader_writer_test.cc b/src/test/reader_writer_test.cc
index 927a660073ca8ea84d25c1cd9b3243258dca4582..dec7cce317b442b9e7e48b639a81231913b39394 100644
--- a/src/test/reader_writer_test.cc
+++ b/src/test/reader_writer_test.cc
@@ -14,7 +14,7 @@
 #include <dune/common/filledarray.hh>
 #include <dune/common/test/testsuite.hh>
 
-#if HAVE_UG
+#if HAVE_DUNE_UGGRID
 #include <dune/grid/uggrid.hh>
 #endif
 
@@ -142,7 +142,7 @@ int main (int argc, char** argv)
 
   TestSuite test{};
 
-#if HAVE_UG
+#if HAVE_DUNE_UGGRID
   // Test VtkWriter for UGGrid
   Hybrid::forEach(std::make_tuple(int_<2>{}, int_<3>{}), [&test,&mpi](auto dim)
   {
diff --git a/src/vtkwriter.cc b/src/vtkwriter.cc
index 435c3ff1a63bb463c45c9ddf70a3227a328b8809..1dad9a377f53d7a442e305532f845f6aeae707f3 100644
--- a/src/vtkwriter.cc
+++ b/src/vtkwriter.cc
@@ -17,7 +17,9 @@
 #include <dune/functions/functionspacebases/interpolate.hh>
 #include <dune/functions/gridfunctions/analyticgridviewfunction.hh>
 #include <dune/functions/gridfunctions/discreteglobalbasisfunction.hh>
+#if HAVE_DUNE_UGGRID
 #include <dune/grid/uggrid.hh>
+#endif
 #include <dune/grid/yaspgrid.hh>
 
 #include <dune/vtk/vtkwriter.hh>
@@ -77,7 +79,7 @@ int main (int argc, char** argv)
 {
   Dune::MPIHelper::instance(argc, argv);
 
-#if HAVE_UG
+#if HAVE_DUNE_UGGRID
   // Test VtkWriter for UGGrid
   Hybrid::forEach(std::make_tuple(int_<2>{}, int_<3>{}), [](auto dim)
   {