diff --git a/examples/dom/color_gallery.cpp b/examples/dom/color_gallery.cpp
index c5d5bf0..15c6fc0 100644
--- a/examples/dom/color_gallery.cpp
+++ b/examples/dom/color_gallery.cpp
@@ -9,8 +9,7 @@ using namespace ftxui;
 #include "./color_info_sorted_2d.ipp"  // for ColorInfoSorted2D
 #include "ftxui/dom/elements.hpp"  // for text, bgcolor, color, vbox, hbox, separator, operator|, Elements, Element, border
 #include "ftxui/dom/node.hpp"      // for Render
-#include "ftxui/screen/box.hpp"    // for ftxui
-#include "ftxui/screen/color.hpp"  // for Color, Color::Black, Color::Blue, Color::BlueLight, Color::Cyan, Color::CyanLight, Color::Default, Color::GrayDark, Color::GrayLight, Color::Green, Color::GreenLight, Color::Magenta, Color::MagentaLight, Color::Red, Color::RedLight, Color::White, Color::Yellow, Color::YellowLight, Color::Palette256
+#include "ftxui/screen/color.hpp"  // for Color, Color::Black, Color::Blue, Color::BlueLight, Color::Cyan, Color::CyanLight, Color::Default, Color::GrayDark, Color::GrayLight, Color::Green, Color::GreenLight, Color::Magenta, Color::MagentaLight, Color::Red, Color::RedLight, Color::White, Color::Yellow, Color::YellowLight, Color::Palette256, ftxui
 
 int main(int argc, const char* argv[]) {
   // clang-format off
diff --git a/src/ftxui/component/component_test.cpp b/src/ftxui/component/component_test.cpp
index cfa46d7..5e1813c 100644
--- a/src/ftxui/component/component_test.cpp
+++ b/src/ftxui/component/component_test.cpp
@@ -1,8 +1,8 @@
-#include <gtest/gtest.h>  // for Test, SuiteApiResolver, TestInfo (ptr only), TEST, TestFactoryImpl
 #include <memory>  // for shared_ptr, allocator, make_shared, __shared_ptr_access
 
 #include "ftxui/component/captured_mouse.hpp"  // for ftxui
 #include "ftxui/component/component_base.hpp"  // for ComponentBase, Component
+#include "gtest/gtest_pred_impl.h"  // for Test, SuiteApiResolver, TEST, TestFactoryImpl
 
 using namespace ftxui;
 
diff --git a/src/ftxui/component/terminal_input_parser.cpp b/src/ftxui/component/terminal_input_parser.cpp
index 7091ab1..b9526ad 100644
--- a/src/ftxui/component/terminal_input_parser.cpp
+++ b/src/ftxui/component/terminal_input_parser.cpp
@@ -1,8 +1,9 @@
 #include "ftxui/component/terminal_input_parser.hpp"
 
 #include <algorithm>  // for max
-#include <memory>     // for unique_ptr
-#include <utility>    // for move
+#include <cstdint>
+#include <memory>   // for unique_ptr
+#include <utility>  // for move
 
 #include "ftxui/component/event.hpp"  // for Event
 
@@ -129,7 +130,7 @@ TerminalInputParser::Output TerminalInputParser::ParseUTF8() {
   }
 
   // Accumulate the value of the first byte.
-  wchar_t value = head & ~mask;
+  uint32_t value = head & ~mask;
 
   // Invalid UTF8, with more than 5 bytes.
   if (first_zero == 1 || first_zero >= 5)