diff --git a/src/ui/circles.cpp b/src/ui/circles.cpp
index c6d9d35..2de9758 100644
--- a/src/ui/circles.cpp
+++ b/src/ui/circles.cpp
@@ -2,10 +2,14 @@
  * @file circles.cpp
  */
 
+#include <exception>  // for std::runtime_error
+#include <string>     // for std::string
+
 #include <SFML/Graphics.hpp>
 
 #include "circles.hpp"
 #include "core/settings/colors.hpp"
+#include "core/settings/screen.hpp"
 
 namespace ui::circles {
 
diff --git a/src/ui/circles.hpp b/src/ui/circles.hpp
index baabe6f..61a63db 100644
--- a/src/ui/circles.hpp
+++ b/src/ui/circles.hpp
@@ -6,14 +6,11 @@
 
 #pragma once
 
-#include <exception>  // for std::runtime_error
-#include <string>     // for std::string
+#include <string>  // for std::string
 
 #include <SFML/Graphics.hpp>
 
 #include "components/base.hpp"
-#include "core/settings/colors.hpp"
-#include "core/settings/screen.hpp"
 
 namespace ui::circles {
 
diff --git a/src/ui/widgets.cpp b/src/ui/widgets.cpp
index 05b58bf..d3877b3 100644
--- a/src/ui/widgets.cpp
+++ b/src/ui/widgets.cpp
@@ -2,9 +2,13 @@
  * @file widets.cpp
  */
 
+#include <string>  // for std::string
+
 #include <SFML/Graphics.hpp>
 
+#include "core/assets/font.hpp"
 #include "core/settings/colors.hpp"
+#include "core/settings/screen.hpp"
 #include "widgets.hpp"
 
 namespace ui::widgets {
diff --git a/src/ui/widgets.hpp b/src/ui/widgets.hpp
index 80d4abd..0188623 100644
--- a/src/ui/widgets.hpp
+++ b/src/ui/widgets.hpp
@@ -13,8 +13,6 @@
 #include <fmt/core.h>
 
 #include "core/assets/font.hpp"
-#include "core/settings/colors.hpp"
-#include "core/settings/screen.hpp"
 
 namespace ui::widgets {