diff --git a/example/main.cpp b/example/main.cpp
index 072a6aa..c918473 100644
--- a/example/main.cpp
+++ b/example/main.cpp
@@ -1,5 +1,5 @@
 #include <iostream>
-#include <list>
+#include <utility>
 #include <rectpack2D/finders_interface.h>
 
 /* For description of the algorithm, please see the README.md */
diff --git a/src/rectpack2D/best_bin_finder.h b/src/rectpack2D/best_bin_finder.h
index 8af5a62..3a5655d 100644
--- a/src/rectpack2D/best_bin_finder.h
+++ b/src/rectpack2D/best_bin_finder.h
@@ -1,7 +1,7 @@
 #pragma once
 #include <variant>
 #include <cassert>
-#include <algorithm>
+#include <optional>
 #include "rect_structs.h"
 
 namespace rectpack2D {
diff --git a/src/rectpack2D/empty_space_allocators.h b/src/rectpack2D/empty_space_allocators.h
index 217ef77..1cae1b0 100644
--- a/src/rectpack2D/empty_space_allocators.h
+++ b/src/rectpack2D/empty_space_allocators.h
@@ -1,8 +1,6 @@
 #pragma once
 #include <array>
 #include <vector>
-#include <type_traits>
-
 #include "rect_structs.h"
 
 namespace rectpack2D {
diff --git a/src/rectpack2D/empty_spaces.h b/src/rectpack2D/empty_spaces.h
index bb0ad79..53baf4e 100644
--- a/src/rectpack2D/empty_spaces.h
+++ b/src/rectpack2D/empty_spaces.h
@@ -1,4 +1,5 @@
 #pragma once
+#include <optional>
 #include "insert_and_split.h"
 
 namespace rectpack2D {
diff --git a/src/rectpack2D/finders_interface.h b/src/rectpack2D/finders_interface.h
index 80af60a..9e85568 100644
--- a/src/rectpack2D/finders_interface.h
+++ b/src/rectpack2D/finders_interface.h
@@ -1,16 +1,8 @@
 #pragma once
-#include <optional>
-#include <vector>
-#include <array>
-#include <variant>
 #include <memory>
-#include <algorithm>
-
-#include "insert_and_split.h"
 #include "empty_spaces.h"
-#include "empty_space_allocators.h"
-
 #include "best_bin_finder.h"
+#include "empty_space_allocators.h" // IWYU pragma: export
 
 namespace rectpack2D {
 	template <class empty_spaces_type>
diff --git a/src/rectpack2D/rect_structs.h b/src/rectpack2D/rect_structs.h
index 6b26295..b4d55a7 100644
--- a/src/rectpack2D/rect_structs.h
+++ b/src/rectpack2D/rect_structs.h
@@ -1,5 +1,5 @@
 #pragma once
-#include <utility>
+#include <algorithm>
 
 namespace rectpack2D {
 	using total_area_type = int;
@@ -87,4 +87,4 @@ namespace rectpack2D {
 	};
 
 	using space_rect = rect_xywh;
-}
\ No newline at end of file
+}