diff --git a/Components/9918/Implementation/9918Base.hpp b/Components/9918/Implementation/9918Base.hpp
index 83c00b001..93d00218f 100644
--- a/Components/9918/Implementation/9918Base.hpp
+++ b/Components/9918/Implementation/9918Base.hpp
@@ -9,13 +9,16 @@
 #ifndef TMS9918Base_hpp
 #define TMS9918Base_hpp
 
-#include "../../../Outputs/CRT/CRT.hpp"
-#include "../../../ClockReceiver/ClockReceiver.hpp"
 #include "ClockConverter.hpp"
 
+#include "../../../ClockReceiver/ClockReceiver.hpp"
+#include "../../../Numeric/BitReverse.hpp"
+#include "../../../Outputs/CRT/CRT.hpp"
+
 #include <array>
 #include <cassert>
 #include <cstdint>
+#include <cstring>
 #include <memory>
 #include <vector>
 
diff --git a/Components/9918/Implementation/Draw.hpp b/Components/9918/Implementation/Draw.hpp
index 304afeeef..4fe6da102 100644
--- a/Components/9918/Implementation/Draw.hpp
+++ b/Components/9918/Implementation/Draw.hpp
@@ -9,8 +9,6 @@
 #ifndef Draw_hpp
 #define Draw_hpp
 
-#include "../../../Numeric/BitReverse.hpp"
-
 // MARK: - TMS9918
 
 template <Personality personality>