Move byte from engine.h

Source/codec.cpp

@@ -4,13 +4,12 @@
  * Implementation of save game encryption algorithm.
  */
 
-#include <cstddef>
 #include <cstdint>
 
 #include "appfat.h"
-#include "engine.h"
 #include "miniwin/miniwin.h"
 #include "sha.h"
+#include "utils/stdcompat/cstddef.hpp"
 
 namespace devilution {
 

Source/codec.h

@@ -5,9 +5,7 @@
  */
 #pragma once
 
-#include <cstddef>
-
-#include "engine.h"
+#include "utils/stdcompat/cstddef.hpp"
 
 namespace devilution {
 

Source/encrypt.cpp

@@ -4,10 +4,9 @@
  * Implementation of functions for compression and decompressing MPQ data.
  */
 #include <memory>
+#include <SDL.h>
 
 #include "encrypt.h"
-
-#include "engine.h"
 #include "pkware.h"
 
 namespace devilution {

Source/encrypt.h

@@ -7,7 +7,7 @@
 
 #include <cstdint>
 
-#include "engine.h"
+#include "utils/stdcompat/cstddef.hpp"
 
 namespace devilution {
 

Source/engine.h

@@ -14,7 +14,6 @@
 
 #include <algorithm>
 #include <array>
-#include <cstddef>
 #include <cstdint>
 #include <cstdlib>
 #include <memory>
@@ -36,18 +35,12 @@
 
 #include "appfat.h"
 #include "miniwin/miniwin.h"
+#include "utils/stdcompat/cstddef.hpp"
 
 #define TILE_WIDTH 64
 #define TILE_HEIGHT 32
 
 namespace devilution {
-
-#if __cplusplus >= 201703L
-using byte = std::byte;
-#else
-using byte = uint8_t;
-#endif
-
 #if defined(__cpp_lib_clamp)
 using std::clamp;
 #else

Source/engine/render/cel_render.cpp

@@ -5,7 +5,6 @@
  */
 #include "engine/render/cel_render.hpp"
 
-#include <cstddef>
 #include <cstdint>
 #include <cstring>
 

Source/misdat.h

@@ -8,7 +8,7 @@
 #include <cstdint>
 
 #include "effects.h"
-#include "engine.h"
+#include "utils/stdcompat/cstddef.hpp"
 
 namespace devilution {
 

Source/mpqapi.h

@@ -7,7 +7,7 @@
 
 #include <cstdint>
 
-#include "engine.h"
+#include "utils/stdcompat/cstddef.hpp"
 
 namespace devilution {
 

Source/sync.h

@@ -7,7 +7,7 @@
 
 #include <cstdint>
 
-#include "engine.h"
+#include "utils/stdcompat/cstddef.hpp"
 
 namespace devilution {
 

Source/tmsg.h

@@ -7,7 +7,7 @@
 
 #include <cstdint>
 
-#include "engine.h"
+#include "utils/stdcompat/cstddef.hpp"
 
 namespace devilution {
 

Source/towners.h

@@ -5,7 +5,6 @@
  */
 #pragma once
 
-#include <cstddef>
 #include <cstdint>
 #include <memory>
 #include "utils/stdcompat/string_view.hpp"
@@ -13,6 +12,7 @@
 #include "items.h"
 #include "player.h"
 #include "quests.h"
+#include "utils/stdcompat/cstddef.hpp"
 
 namespace devilution {
 

Source/utils/stdcompat/cstddef.hpp

@@ -0,0 +1,16 @@
+#pragma once
+
+#ifdef __has_include
+#if __has_include(<cstddef>)
+#include <cstddef>
+#if defined(__cplusplus) && __cplusplus >= 201703L
+namespace devilution {
+    using byte = std::byte;
+}
+#else
+namespace devilution {
+    using byte = uint8_t;
+}
+#endif
+#endif
+#endif