diff --git a/src/rutile/app.cppm b/src/rutile/app.cppm
index 2eea271..37deff0 100644
--- a/src/rutile/app.cppm
+++ b/src/rutile/app.cppm
@@ -1,11 +1,10 @@
 module;
 
-#include <iostream>
-#include <memory>
 #include <SDL3/SDL_init.h>
 
 export module rutile.app;
 
+import std;
 import rutile.config;
 import rutile.core.engine;
 import rutile.game.game;
diff --git a/src/rutile/config.cppm b/src/rutile/config.cppm
index b5dd5ce..2e36783 100644
--- a/src/rutile/config.cppm
+++ b/src/rutile/config.cppm
@@ -1,7 +1,5 @@
 module;
 
-#include <format>
-
 #ifdef NDEBUG
 #define DEBUG_BOOL false
 #else
@@ -10,6 +8,8 @@ module;
 
 export module rutile.config;
 
+import std;
+
 export namespace rutile::config
 {
     constexpr auto debug = DEBUG_BOOL;
diff --git a/src/rutile/core/drawing/sprite.cppm b/src/rutile/core/drawing/sprite.cppm
index 6835962..1158bde 100644
--- a/src/rutile/core/drawing/sprite.cppm
+++ b/src/rutile/core/drawing/sprite.cppm
@@ -1,11 +1,10 @@
 module;
 
 #include <cassert>
-#include <optional>
-#include <string>
 
 export module rutile.core.drawing.sprite;
 
+import std;
 import rutile.core.render_server;
 import wrappers.sdl;
 
diff --git a/src/rutile/core/drawing/tile_map.cppm b/src/rutile/core/drawing/tile_map.cppm
index 2fa9111..de66b2c 100644
--- a/src/rutile/core/drawing/tile_map.cppm
+++ b/src/rutile/core/drawing/tile_map.cppm
@@ -1,11 +1,10 @@
 module;
 
 #include <cassert>
-#include <cstddef>
-#include <memory>
 
 export module rutile.core.drawing.tile_map;
 
+import std;
 import rutile.core.drawing.tile_set;
 import rutile.core.render_server;
 import wrappers.sdl;
@@ -13,7 +12,7 @@ import wrappers.sdl;
 export namespace rutile
 {
     // Restrict map size to 16 bit per dimension, so that width*height still fits within size_t
-    using MapCoord = uint16_t;
+    using MapCoord = std::uint16_t;
 
     class TileMap
     {
diff --git a/src/rutile/core/drawing/tile_set.cppm b/src/rutile/core/drawing/tile_set.cppm
index 6fcbec5..ddad86c 100644
--- a/src/rutile/core/drawing/tile_set.cppm
+++ b/src/rutile/core/drawing/tile_set.cppm
@@ -1,12 +1,10 @@
 module;
 
 #include <cassert>
-#include <string>
-#include <utility>
-#include <vector>
 
 export module rutile.core.drawing.tile_set;
 
+import std;
 import rutile.core.render_server;
 import wrappers.sdl;
 
diff --git a/src/rutile/core/engine.cppm b/src/rutile/core/engine.cppm
index 680d382..984f323 100644
--- a/src/rutile/core/engine.cppm
+++ b/src/rutile/core/engine.cppm
@@ -1,10 +1,10 @@
 module;
 
 #include <cassert>
-#include <memory>
 
 export module rutile.core.engine;
 
+import std;
 import rutile.config;
 import rutile.core.render_server;
 import rutile.core.ui.ui_server;
diff --git a/src/rutile/core/render_server.cppm b/src/rutile/core/render_server.cppm
index ad32e73..7366b13 100644
--- a/src/rutile/core/render_server.cppm
+++ b/src/rutile/core/render_server.cppm
@@ -1,10 +1,8 @@
 module;
 
-#include <string>
-#include <utility>
-
 export module rutile.core.render_server;
 
+import std;
 import rutile.core.resource_manager;
 import rutile.core.texture_loader;
 import wrappers.sdl;
diff --git a/src/rutile/core/resource_manager.cppm b/src/rutile/core/resource_manager.cppm
index dddac0d..b73f184 100644
--- a/src/rutile/core/resource_manager.cppm
+++ b/src/rutile/core/resource_manager.cppm
@@ -1,13 +1,11 @@
 module;
 
 #include <cassert>
-#include <map>
-#include <optional>
-#include <string>
-#include <vector>
 
 export module rutile.core.resource_manager;
 
+import std;
+
 export namespace rutile
 {
     template <typename ResourceLoaderType, typename ResourceType>
diff --git a/src/rutile/core/texture_loader.cppm b/src/rutile/core/texture_loader.cppm
index 2bf1f08..78cb3df 100644
--- a/src/rutile/core/texture_loader.cppm
+++ b/src/rutile/core/texture_loader.cppm
@@ -1,9 +1,8 @@
 module;
 
-#include <string>
-
 export module rutile.core.texture_loader;
 
+import std;
 import rutile.core.resource_manager;
 import wrappers.sdl;
 import wrappers.sdl_image;
diff --git a/src/rutile/core/ui/backend/rmlui_render_interface.cppm b/src/rutile/core/ui/backend/rmlui_render_interface.cppm
index c2412f3..f64528f 100644
--- a/src/rutile/core/ui/backend/rmlui_render_interface.cppm
+++ b/src/rutile/core/ui/backend/rmlui_render_interface.cppm
@@ -11,6 +11,7 @@ module;
 
 export module rutile.core.ui.backend.rmlui_render_interface;
 
+import std;
 import wrappers.sdl;
 import wrappers.sdl_image;
 
@@ -78,9 +79,9 @@ export namespace rutile
             {
                 const GeometryView* geometry = reinterpret_cast<GeometryView*>(handle);
                 const Rml::Vertex* vertices = geometry->vertices.data();
-                const size_t num_vertices = geometry->vertices.size();
+                const std::size_t num_vertices = geometry->vertices.size();
                 const int* indices = geometry->indices.data();
-                const size_t num_indices = geometry->indices.size();
+                const std::size_t num_indices = geometry->indices.size();
 
                 // Convert RmlUi vertices to SDL vertices
                 auto sdl_vertices = std::make_unique<sdl::Vertex[]>(num_vertices);
@@ -125,7 +126,7 @@ export namespace rutile
                 }
 
                 // Convert colors to premultiplied alpha, which is necessary for correct alpha compositing.
-                const size_t pixels_byte_size = surface.get_width() * surface.get_height() * 4;
+                const std::size_t pixels_byte_size = surface.get_width() * surface.get_height() * 4;
                 Rml::byte* pixels = static_cast<Rml::byte*>(surface.get_raw_pixels());
 
                 for (size_t i = 0; i < pixels_byte_size; i += 4) {
diff --git a/src/rutile/core/ui/ui_server.cppm b/src/rutile/core/ui/ui_server.cppm
index 3f15b70..66eb4c9 100644
--- a/src/rutile/core/ui/ui_server.cppm
+++ b/src/rutile/core/ui/ui_server.cppm
@@ -1,12 +1,12 @@
 module;
 
 #include <cassert>
-#include <format>
 #include <RmlUi/Core.h>
 #include <RmlUi/Debugger.h>
 
 export module rutile.core.ui.ui_server;
 
+import std;
 import rutile.core.ui.backend.rmlui_render_interface;
 import rutile.core.ui.backend.rmlui_system_interface;
 import rutile.core.ui.backend.rmlui_input_handler;
diff --git a/src/rutile/game/game.cppm b/src/rutile/game/game.cppm
index c7a45b9..8b7a1ff 100644
--- a/src/rutile/game/game.cppm
+++ b/src/rutile/game/game.cppm
@@ -1,13 +1,11 @@
 module;
 
 #include <cassert>
-#include <memory>
-#include <optional>
-#include <vector>
 #include <RmlUi/Core/ElementDocument.h>
 
 export module rutile.game.game;
 
+import std;
 import rutile.core.drawing.sprite;
 import rutile.core.drawing.tile_map;
 import rutile.core.drawing.tile_set;
diff --git a/src/wrappers/sdl/clipboard.cppm b/src/wrappers/sdl/clipboard.cppm
index bb84b79..8ab1278 100644
--- a/src/wrappers/sdl/clipboard.cppm
+++ b/src/wrappers/sdl/clipboard.cppm
@@ -1,10 +1,10 @@
 module;
 
-#include <string>
 #include <SDL3/SDL_clipboard.h>
 
 export module wrappers.sdl.clipboard;
 
+import std;
 import wrappers.sdl.error;
 import wrappers.sdl.utils;
 
diff --git a/src/wrappers/sdl/error.cppm b/src/wrappers/sdl/error.cppm
index c4f23df..0b12725 100644
--- a/src/wrappers/sdl/error.cppm
+++ b/src/wrappers/sdl/error.cppm
@@ -1,11 +1,11 @@
 module;
 
-#include <format>
-#include <stdexcept>
 #include <SDL3/SDL_error.h>
 
 export module wrappers.sdl.error;
 
+import std;
+
 export namespace sdl
 {
     // Exception that wraps an SDL error (which SDL function caused the error, what's the error).
diff --git a/src/wrappers/sdl/init.cppm b/src/wrappers/sdl/init.cppm
index 9e3653a..f673011 100644
--- a/src/wrappers/sdl/init.cppm
+++ b/src/wrappers/sdl/init.cppm
@@ -1,10 +1,10 @@
 module;
 
-#include <type_traits>
 #include <SDL3/SDL_init.h>
 
 export module wrappers.sdl.init;
 
+import std;
 import wrappers.sdl.error;
 
 export namespace sdl
diff --git a/src/wrappers/sdl/mouse.cppm b/src/wrappers/sdl/mouse.cppm
index a9671f2..e612c00 100644
--- a/src/wrappers/sdl/mouse.cppm
+++ b/src/wrappers/sdl/mouse.cppm
@@ -5,9 +5,11 @@ module;
 
 export module wrappers.sdl.mouse;
 
+import std;
+
 export namespace sdl
 {
-    using MouseButtonIndex = uint8_t;
+    using MouseButtonIndex = std::uint8_t;
 
     namespace MouseButtons
     {
diff --git a/src/wrappers/sdl/render.cppm b/src/wrappers/sdl/render.cppm
index 0ea45a9..a556c3f 100644
--- a/src/wrappers/sdl/render.cppm
+++ b/src/wrappers/sdl/render.cppm
@@ -1,11 +1,11 @@
 module;
 
 #include <cassert>
-#include <memory>
 #include <SDL3/SDL.h>
 
 export module wrappers.sdl.render;
 
+import std;
 import utils.memory;
 import wrappers.sdl.error;
 import wrappers.sdl.rect;
diff --git a/src/wrappers/sdl/surface.cppm b/src/wrappers/sdl/surface.cppm
index c48d8c3..88cba61 100644
--- a/src/wrappers/sdl/surface.cppm
+++ b/src/wrappers/sdl/surface.cppm
@@ -1,11 +1,11 @@
 module;
 
 #include <cassert>
-#include <memory>
 #include <SDL3/SDL.h>
 
 export module wrappers.sdl.surface;
 
+import std;
 import utils.memory;
 import wrappers.sdl.error;
 
diff --git a/src/wrappers/sdl/utils.cppm b/src/wrappers/sdl/utils.cppm
index c544c51..96dd45e 100644
--- a/src/wrappers/sdl/utils.cppm
+++ b/src/wrappers/sdl/utils.cppm
@@ -1,10 +1,11 @@
 module;
 
-#include <string>
 #include <SDL3/SDL_stdinc.h>
 
 export module wrappers.sdl.utils;
 
+import std;
+
 export namespace sdl
 {
     /**
diff --git a/src/wrappers/sdl/video.cppm b/src/wrappers/sdl/video.cppm
index 4141b01..f393a43 100644
--- a/src/wrappers/sdl/video.cppm
+++ b/src/wrappers/sdl/video.cppm
@@ -1,11 +1,11 @@
 module;
 
 #include <cassert>
-#include <memory>
 #include <SDL3/SDL.h>
 
 export module wrappers.sdl.video;
 
+import std;
 import utils.memory;
 import wrappers.sdl.error;
 import wrappers.sdl.rect;
diff --git a/src/wrappers/sdl_image.cppm b/src/wrappers/sdl_image.cppm
index 5418c93..7312e9c 100644
--- a/src/wrappers/sdl_image.cppm
+++ b/src/wrappers/sdl_image.cppm
@@ -1,11 +1,11 @@
 module;
 
-#include <string>
 #include <SDL3/SDL.h>
 #include <SDL3_image/SDL_image.h>
 
 export module wrappers.sdl_image;
 
+import std;
 import utils.memory;
 import wrappers.sdl.error;
 import wrappers.sdl.render;