diff --git a/examples/src/attributes.cpp b/examples/src/attributes.cpp
index 25d24b2..4aeaef2 100644
--- a/examples/src/attributes.cpp
+++ b/examples/src/attributes.cpp
@@ -1,6 +1,5 @@
 import std;
-import utempl.attributes;
-import utempl.type_list;
+import utempl;
 #include <utempl/macro.hpp>
 
 template <typename T>
diff --git a/examples/src/curry.cpp b/examples/src/curry.cpp
index 55d31b7..6a8eacd 100644
--- a/examples/src/curry.cpp
+++ b/examples/src/curry.cpp
@@ -1,4 +1,4 @@
-import utempl.utils;
+import utempl;
 import std;
 
 auto main() -> int {
diff --git a/examples/src/go_interface.cpp b/examples/src/go_interface.cpp
index d3f76cd..2f55bcb 100644
--- a/examples/src/go_interface.cpp
+++ b/examples/src/go_interface.cpp
@@ -1,5 +1,5 @@
 import fmt;
-import utempl.go_interface;
+import utempl;
 import std;
 
 struct SomeInterfaceImpl {
diff --git a/examples/src/left_fold.cpp b/examples/src/left_fold.cpp
index 110474e..5395c11 100644
--- a/examples/src/left_fold.cpp
+++ b/examples/src/left_fold.cpp
@@ -1,5 +1,4 @@
-import utempl.utils;
-import utempl.tuple;
+import utempl;
 import std;
 
 auto main() -> int {
diff --git a/examples/src/make.cpp b/examples/src/make.cpp
index c265bc9..bfe4b24 100644
--- a/examples/src/make.cpp
+++ b/examples/src/make.cpp
@@ -1,4 +1,4 @@
-import utempl.utils;
+import utempl;
 import std;
 
 auto main() -> int {
diff --git a/examples/src/menu.cpp b/examples/src/menu.cpp
index 002f10c..495f882 100644
--- a/examples/src/menu.cpp
+++ b/examples/src/menu.cpp
@@ -1,4 +1,4 @@
-import utempl.menu;
+import utempl;
 import std;
 
 auto main() -> int {
diff --git a/examples/src/meta.cpp b/examples/src/meta.cpp
index 8a64b15..4e7f934 100644
--- a/examples/src/meta.cpp
+++ b/examples/src/meta.cpp
@@ -1,4 +1,4 @@
-import utempl.meta_info;
+import utempl;
 import std;
 
 auto main() -> int {
diff --git a/examples/src/overloaded.cpp b/examples/src/overloaded.cpp
index 06c237c..d244a8d 100644
--- a/examples/src/overloaded.cpp
+++ b/examples/src/overloaded.cpp
@@ -1,4 +1,4 @@
-import utempl.overloaded;
+import utempl;
 import std;
 
 auto main() -> int {
diff --git a/examples/src/reverse.cpp b/examples/src/reverse.cpp
index 8ae7bf9..969e153 100644
--- a/examples/src/reverse.cpp
+++ b/examples/src/reverse.cpp
@@ -1,5 +1,4 @@
-import utempl.utils;
-import utempl.tuple;
+import utempl;
 import std;
 
 auto main() -> int {
diff --git a/examples/src/switch.cpp b/examples/src/switch.cpp
index 27cdece..6b5b104 100644
--- a/examples/src/switch.cpp
+++ b/examples/src/switch.cpp
@@ -1,5 +1,4 @@
-import utempl.utils;
-import utempl.tuple;
+import utempl;
 import std;
 
 auto main() -> int {
diff --git a/examples/src/times.cpp b/examples/src/times.cpp
index f3477d8..c5d226a 100644
--- a/examples/src/times.cpp
+++ b/examples/src/times.cpp
@@ -1,4 +1,4 @@
-import utempl.utils;
+import utempl;
 import std;
 
 auto main() -> int {
diff --git a/examples/src/tuple.cpp b/examples/src/tuple.cpp
index 0d2cf23..ab2537a 100644
--- a/examples/src/tuple.cpp
+++ b/examples/src/tuple.cpp
@@ -1,7 +1,5 @@
 #include <cassert>
-import utempl.utils;
-import utempl.tuple;
-import utempl.overloaded;
+import utempl;
 import std;
 
 auto main() -> int {
diff --git a/tests/go_interface.cpp b/tests/go_interface.cpp
index eb72b71..2377855 100644
--- a/tests/go_interface.cpp
+++ b/tests/go_interface.cpp
@@ -1,7 +1,7 @@
 module;
 #include <gtest/gtest.h>
 export module tests.go_interface;
-import utempl.go_interface;
+import utempl;
 
 namespace utempl {
 
diff --git a/tests/menu.cpp b/tests/menu.cpp
index 2437ae6..3cd2aae 100644
--- a/tests/menu.cpp
+++ b/tests/menu.cpp
@@ -1,7 +1,7 @@
 module;
 #include <gtest/gtest.h>
 export module tests.menu;
-import utempl.menu;
+import utempl;
 
 namespace utempl {
 
diff --git a/tests/overloaded.cpp b/tests/overloaded.cpp
index 16f5bb2..b299f88 100644
--- a/tests/overloaded.cpp
+++ b/tests/overloaded.cpp
@@ -1,7 +1,7 @@
 module;
 #include <gtest/gtest.h>
 export module tests.overloaded;
-import utempl.overloaded;
+import utempl;
 
 namespace utempl {