diff --git a/include/eventpp/callbacklist.h b/include/eventpp/callbacklist.h
index e341412..b053ac7 100644
--- a/include/eventpp/callbacklist.h
+++ b/include/eventpp/callbacklist.h
@@ -15,14 +15,9 @@
 #define CALLBACKLIST_H_588722158669
 
 #include "eventpolicies.h"
-#include "internal/typeutil_i.h"
 
-#include <atomic>
-#include <condition_variable>
 #include <functional>
-#include <memory>
 #include <mutex>
-#include <utility>
 
 namespace eventpp {
 
diff --git a/include/eventpp/eventdispatcher.h b/include/eventpp/eventdispatcher.h
index 4b3e78d..ce0953b 100644
--- a/include/eventpp/eventdispatcher.h
+++ b/include/eventpp/eventdispatcher.h
@@ -16,12 +16,6 @@
 
 #include "callbacklist.h"
 
-#include <string>
-#include <functional>
-#include <type_traits>
-#include <mutex>
-#include <memory>
-
 namespace eventpp {
 
 namespace internal_ {
diff --git a/include/eventpp/eventpolicies.h b/include/eventpp/eventpolicies.h
index 42ef55e..886ac10 100644
--- a/include/eventpp/eventpolicies.h
+++ b/include/eventpp/eventpolicies.h
@@ -16,7 +16,6 @@
 
 #include "internal/typeutil_i.h"
 
-#include <mutex>
 #include <atomic>
 #include <condition_variable>
 #include <map>
diff --git a/include/eventpp/eventqueue.h b/include/eventpp/eventqueue.h
index 5ac3066..80c7700 100644
--- a/include/eventpp/eventqueue.h
+++ b/include/eventpp/eventqueue.h
@@ -17,12 +17,8 @@
 #include "eventdispatcher.h"
 #include "internal/eventqueue_i.h"
 
-#include <list>
 #include <tuple>
 #include <chrono>
-#include <mutex>
-#include <array>
-#include <cassert>
 
 namespace eventpp {
 
diff --git a/include/eventpp/hetercallbacklist.h b/include/eventpp/hetercallbacklist.h
index 139ce72..4f7a1b0 100644
--- a/include/eventpp/hetercallbacklist.h
+++ b/include/eventpp/hetercallbacklist.h
@@ -18,11 +18,7 @@
 #include "callbacklist.h"
 
 #include <array>
-#include <functional>
-#include <type_traits>
 #include <mutex>
-#include <memory>
-#include <tuple>
 
 namespace eventpp {
 
diff --git a/include/eventpp/hetereventdispatcher.h b/include/eventpp/hetereventdispatcher.h
index 12456e9..c803dd5 100644
--- a/include/eventpp/hetereventdispatcher.h
+++ b/include/eventpp/hetereventdispatcher.h
@@ -14,17 +14,7 @@
 #ifndef HETEREVENTDISPATCHER_H_127766658555
 #define HETEREVENTDISPATCHER_H_127766658555
 
-#include "eventdispatcher.h"
-#include "hetercallbacklist.h"
 #include "mixins/mixinheterfilter.h"
-#include "mixins/mixinfilter.h"
-
-#include <array>
-#include <functional>
-#include <type_traits>
-#include <mutex>
-#include <memory>
-#include <tuple>
 
 namespace eventpp {
 
diff --git a/include/eventpp/mixins/mixinfilter.h b/include/eventpp/mixins/mixinfilter.h
index 98cbb06..e2926d9 100644
--- a/include/eventpp/mixins/mixinfilter.h
+++ b/include/eventpp/mixins/mixinfilter.h
@@ -15,10 +15,6 @@
 #define MIXINFILTER_H_713231680355
 
 #include "../callbacklist.h"
-#include "../internal/typeutil_i.h"
-
-#include <functional>
-#include <type_traits>
 
 namespace eventpp {
 
diff --git a/include/eventpp/mixins/mixinheterfilter.h b/include/eventpp/mixins/mixinheterfilter.h
index 22a42ca..c3bf355 100644
--- a/include/eventpp/mixins/mixinheterfilter.h
+++ b/include/eventpp/mixins/mixinheterfilter.h
@@ -15,10 +15,6 @@
 #define MIXINHETERFILTER_H_990158796753
 
 #include "../hetercallbacklist.h"
-#include "../internal/typeutil_i.h"
-
-#include <functional>
-#include <type_traits>
 
 namespace eventpp {
 
diff --git a/include/eventpp/utilities/anyid.h b/include/eventpp/utilities/anyid.h
index 99d1dc9..66e0891 100644
--- a/include/eventpp/utilities/anyid.h
+++ b/include/eventpp/utilities/anyid.h
@@ -15,7 +15,6 @@
 #define ANYID_H_320827729782
 
 #include <functional>
-#include <type_traits>
 
 namespace eventpp {
 
diff --git a/include/eventpp/utilities/conditionalremover.h b/include/eventpp/utilities/conditionalremover.h
index 19637b1..a3ea8b3 100644
--- a/include/eventpp/utilities/conditionalremover.h
+++ b/include/eventpp/utilities/conditionalremover.h
@@ -16,8 +16,6 @@
 
 #include "../eventpolicies.h"
 
-#include <memory>
-
 namespace eventpp {
 
 template <typename DispatcherType, typename Enabled = void>
diff --git a/include/eventpp/utilities/counterremover.h b/include/eventpp/utilities/counterremover.h
index 05fff83..1cc6542 100644
--- a/include/eventpp/utilities/counterremover.h
+++ b/include/eventpp/utilities/counterremover.h
@@ -16,8 +16,6 @@
 
 #include "../eventpolicies.h"
 
-#include <memory>
-
 namespace eventpp {
 
 template <typename DispatcherType, typename Enabled = void>
diff --git a/include/eventpp/utilities/eventutil.h b/include/eventpp/utilities/eventutil.h
index 45be4fb..dc223b7 100644
--- a/include/eventpp/utilities/eventutil.h
+++ b/include/eventpp/utilities/eventutil.h
@@ -14,10 +14,6 @@
 #ifndef EVENTUTIL_H_802615012766
 #define EVENTUTIL_H_802615012766
 
-#include "../eventpolicies.h"
-
-#include <memory>
-
 namespace eventpp {
 
 template <typename DispatcherType>
diff --git a/include/eventpp/utilities/orderedqueuelist.h b/include/eventpp/utilities/orderedqueuelist.h
index c4711cd..99750c3 100644
--- a/include/eventpp/utilities/orderedqueuelist.h
+++ b/include/eventpp/utilities/orderedqueuelist.h
@@ -16,9 +16,7 @@
 
 #include "../eventpolicies.h"
 
-#include <memory>
 #include <list>
-#include <algorithm>
 
 namespace eventpp {
 
diff --git a/include/eventpp/utilities/scopedremover.h b/include/eventpp/utilities/scopedremover.h
index ab2dadc..93979b5 100644
--- a/include/eventpp/utilities/scopedremover.h
+++ b/include/eventpp/utilities/scopedremover.h
@@ -16,7 +16,6 @@
 
 #include "../eventpolicies.h"
 
-#include <memory>
 #include <vector>
 #include <algorithm>