4 files changed, 5 insertions, 8 deletions
diff --git a/editor/editor-enums.hpp b/editor/editor-enums.hpp
index e7e83faf..3806674f 100644
--- a/editor/editor-enums.hpp
+++ b/editor/editor-enums.hpp
@@ -1,5 +1,4 @@
 #pragma once
-#include "compat/integer-types.hpp"
 
 namespace floormat {
 
@@ -7,11 +6,11 @@ enum class editor_mode : unsigned char {
     none, floor, walls, scenery,
 };
 
-enum class editor_wall_rotation : std::uint8_t {
+enum class editor_wall_rotation : unsigned char {
     N, W,
 };
 
-enum class editor_snap_mode : std::uint8_t {
+enum class editor_snap_mode : unsigned char {
     none       = 0,
     horizontal = 1 << 0,
     vertical   = 1 << 1,
diff --git a/editor/editor.hpp b/editor/editor.hpp
index 1093aa8d..bcbc26d1 100644
--- a/editor/editor.hpp
+++ b/editor/editor.hpp
@@ -1,6 +1,5 @@
 #pragma once
 #include "compat/defs.hpp"
-#include "compat/integer-types.hpp"
 #include "global-coords.hpp"
 #include "tile-image.hpp"
 #include "scenery.hpp"
@@ -29,7 +28,7 @@ struct editor final
     tile_editor* current_tile_editor() noexcept;
     const tile_editor* current_tile_editor() const noexcept;
 
-    enum class button : std::uint8_t { none, place, remove, };
+    enum class button : unsigned char { none, place, remove, };
 
     void on_click(world& world, global_coords pos, int mods, button b);
     void on_click_(world& world, global_coords pos, button b);
diff --git a/editor/keys.hpp b/editor/keys.hpp
index 611f78e1..12b96f27 100644
--- a/editor/keys.hpp
+++ b/editor/keys.hpp
@@ -1,5 +1,4 @@
 #pragma once
-#include "compat/integer-types.hpp"
 
 namespace floormat {
 
@@ -12,7 +11,7 @@ enum kmod : int {
     kmod_mask  = kmod_shift | kmod_ctrl | kmod_alt | kmod_super,
 };
 
-enum key : std::uint32_t {
+enum key : unsigned {
     key_noop,
     key_camera_up, key_camera_left, key_camera_right, key_camera_down, key_camera_reset,
     key_rotate_tile,
diff --git a/editor/tile-editor.hpp b/editor/tile-editor.hpp
index 9f4bb2db..4569bfee 100644
--- a/editor/tile-editor.hpp
+++ b/editor/tile-editor.hpp
@@ -15,7 +15,7 @@ struct world;
 struct tile_editor final
 {
 private:
-    enum selection_mode : std::uint8_t {
+    enum selection_mode : unsigned char {
         sel_none, sel_tile, sel_perm,
     };