diff --git a/examples/component/button_in_frame.cpp b/examples/component/button_in_frame.cpp
index 23a0d94778dd03ba131c3299034203be3975ae1b..2eb3393cb15414e58be2fdd5dde900f3fa6e2237 100644
--- a/examples/component/button_in_frame.cpp
+++ b/examples/component/button_in_frame.cpp
@@ -1,12 +1,13 @@
-#include <array> // for array
-#include <memory> // for shared_ptr, __shared_ptr_access
-#include <string> // for operator+, to_string
+#include <memory> // for allocator, __shared_ptr_access, shared_ptr
+#include <string> // for to_string, operator+
#include "ftxui/component/captured_mouse.hpp" // for ftxui
-#include "ftxui/component/component.hpp" // for Checkbox, Renderer, Vertical
-#include "ftxui/component/component_base.hpp" // for ComponentBase
+#include "ftxui/component/component.hpp" // for Button, Renderer, Vertical
+#include "ftxui/component/component_base.hpp" // for ComponentBase
+#include "ftxui/component/component_options.hpp" // for ButtonOption
#include "ftxui/component/screen_interactive.hpp" // for ScreenInteractive
-#include "ftxui/dom/elements.hpp" // for operator|, Element, size, border, frame, vscroll_indicator, HEIGHT, LESS_THAN
+#include "ftxui/dom/elements.hpp" // for operator|, text, Element, hbox, separator, size, vbox, border, frame, vscroll_indicator, HEIGHT, LESS_THAN
+#include "ftxui/screen/color.hpp" // for Color, Color::Default, Color::GrayDark, Color::White
using namespace ftxui;
diff --git a/examples/component/button_style.cpp b/examples/component/button_style.cpp
index 7473263337eed0f8091d941ce369bbdd3b30a480..275c27d0208efbbbfb43405dfe6444ce81b23e01 100644
--- a/examples/component/button_style.cpp
+++ b/examples/component/button_style.cpp
@@ -1,12 +1,11 @@
-#include <memory> // for shared_ptr, __shared_ptr_access
#include <string> // for operator+, to_string
#include "ftxui/component/captured_mouse.hpp" // for ftxui
-#include "ftxui/component/component.hpp" // for Button, Horizontal, Renderer
-#include "ftxui/component/component_base.hpp" // for ComponentBase
+#include "ftxui/component/component.hpp" // for Button, Renderer, Vertical, Horizontal, operator|
+#include "ftxui/component/component_base.hpp" // for Component
#include "ftxui/component/component_options.hpp" // for ButtonOption
#include "ftxui/component/screen_interactive.hpp" // for ScreenInteractive
-#include "ftxui/dom/elements.hpp" // for gauge, separator, text, vbox, operator|, Element, border
+#include "ftxui/dom/elements.hpp" // for separator, Element, text, border
#include "ftxui/screen/color.hpp" // for Color, Color::Blue, Color::Green, Color::Red
using namespace ftxui;
diff --git a/examples/component/maybe.cpp b/examples/component/maybe.cpp
index 49266279e3e3da27ce74a6872ec093cbb922ed8d..5c1419b68002f48e85c633c97da7b55a22b9c9ff 100644
--- a/examples/component/maybe.cpp
+++ b/examples/component/maybe.cpp
@@ -1,5 +1,4 @@
-#include <memory> // for allocator, shared_ptr
-#include <string> // for string, basic_string
+#include <string> // for string, allocator
#include <vector> // for vector
#include "ftxui/component/captured_mouse.hpp" // for ftxui
diff --git a/examples/dom/hflow.cpp b/examples/dom/hflow.cpp
index c2a9f88227ba609988e6c0c1d3a6b6744772c4f4..d86ad92f27757f573d1e92cef98ac287bbfa3c89 100644
--- a/examples/dom/hflow.cpp
+++ b/examples/dom/hflow.cpp
@@ -1,8 +1,7 @@
#include <stdio.h> // for getchar
#include <ftxui/dom/elements.hpp> // for operator|, size, Element, text, hcenter, Decorator, Fit, WIDTH, hflow, window, EQUAL, GREATER_THAN, HEIGHT, bold, border, dim, LESS_THAN
#include <ftxui/screen/screen.hpp> // for Full, Screen
-#include <memory> // for allocator, shared_ptr
-#include <string> // for operator+, to_string, char_traits, string
+#include <string> // for allocator, operator+, to_string, char_traits, string
#include "ftxui/dom/node.hpp" // for Render
#include "ftxui/screen/color.hpp" // for ftxui
diff --git a/examples/dom/html_like.cpp b/examples/dom/html_like.cpp
index 1425273cd86b95237afcfc48844530c4412be763..7ea23e6d1ceac47281a7e01803dc7eb1c0d5df78 100644
--- a/examples/dom/html_like.cpp
+++ b/examples/dom/html_like.cpp
@@ -1,11 +1,10 @@
#include <chrono> // for operator""s, chrono_literals
-#include <ftxui/screen/screen.hpp> // for Full, Screen
+#include <ftxui/screen/screen.hpp> // for Screen
#include <iostream> // for cout, ostream
-#include <memory> // for allocator, shared_ptr
-#include <string> // for operator<<, string
+#include <string> // for allocator, operator<<, string
#include <thread> // for sleep_for
-#include "ftxui/dom/elements.hpp" // for paragraph, text, operator|, Element, border, color, hflow, spinner, vbox, bold, dim, underlined
+#include "ftxui/dom/elements.hpp" // for paragraph, operator|, text, Element, border, Fit, color, hflow, spinner, vbox, bold, dim, underlined
#include "ftxui/dom/node.hpp" // for Render
#include "ftxui/screen/box.hpp" // for ftxui
#include "ftxui/screen/color.hpp" // for Color, Color::Red
diff --git a/examples/dom/vflow.cpp b/examples/dom/vflow.cpp
index e67167a85a07193a166bf336df0b96a339f59bce..2d05b428b30c2fc24078c55eacc23f217fa0d5c5 100644
--- a/examples/dom/vflow.cpp
+++ b/examples/dom/vflow.cpp
@@ -1,8 +1,7 @@
#include <stdio.h> // for getchar
#include <ftxui/dom/elements.hpp> // for operator|, Element, size, text, hcenter, Fit, vflow, window, EQUAL, bold, border, dim, HEIGHT, WIDTH
#include <ftxui/screen/screen.hpp> // for Full, Screen
-#include <memory> // for allocator, shared_ptr
-#include <string> // for operator+, to_string, char_traits, string
+#include <string> // for allocator, operator+, to_string, char_traits, string
#include "ftxui/dom/node.hpp" // for Render
#include "ftxui/screen/color.hpp" // for ftxui
diff --git a/include/ftxui/component/component_options.hpp b/include/ftxui/component/component_options.hpp
index 7b02f0f9e19e030c4600441aed78f293ee2c57ee..be55dc26b79404f18b8a89dc5cf820e6565b0372 100644
--- a/include/ftxui/component/component_options.hpp
+++ b/include/ftxui/component/component_options.hpp
@@ -2,7 +2,7 @@
#define FTXUI_COMPONENT_COMPONENT_OPTIONS_HPP
#include <chrono> // for milliseconds
-#include <ftxui/component/animation.hpp> // for Duration, QuadraticInOut, Function
+#include <ftxui/component/animation.hpp> // for Duration, Function, QuadraticInOut
#include <ftxui/dom/elements.hpp> // for Element
#include <ftxui/util/ref.hpp> // for Ref
#include <functional> // for function
diff --git a/include/ftxui/component/screen_interactive.hpp b/include/ftxui/component/screen_interactive.hpp
index ab3420741a98b826500e37f19ebef69bd19eef88..02d09c09e0f3c1add0ba3bd0b7c6b1efde917479 100644
--- a/include/ftxui/component/screen_interactive.hpp
+++ b/include/ftxui/component/screen_interactive.hpp
@@ -2,9 +2,9 @@
#define FTXUI_COMPONENT_SCREEN_INTERACTIVE_HPP
#include <atomic> // for atomic
-#include <ftxui/component/receiver.hpp> // for Receiver, Sender
+#include <ftxui/component/receiver.hpp> // for ReceiverImpl, SenderImpl
#include <functional> // for function
-#include <memory> // for shared_ptr
+#include <memory> // for unique_ptr, shared_ptr
#include <string> // for string
#include <thread> // for thread
#include <variant> // for variant
diff --git a/include/ftxui/screen/screen.hpp b/include/ftxui/screen/screen.hpp
index 21eb377645b57d54554bb89743ca3b5e6e367cb5..061173d44c63fe4b0649d751c516f613f49ac0f4 100644
--- a/include/ftxui/screen/screen.hpp
+++ b/include/ftxui/screen/screen.hpp
@@ -2,7 +2,7 @@
#define FTXUI_SCREEN_SCREEN_HPP
#include <memory>
-#include <string> // for string, allocator, basic_string
+#include <string> // for string, allocator
#include <vector> // for vector
#include "ftxui/screen/box.hpp" // for Box
diff --git a/src/ftxui/component/animation_test.cpp b/src/ftxui/component/animation_test.cpp
index e183a04aa8cf02506ef265afe27b77def4ddcf9b..88fb6f4ea4cbd6bb5f45ba420460723b831a3cda 100644
--- a/src/ftxui/component/animation_test.cpp
+++ b/src/ftxui/component/animation_test.cpp
@@ -1,11 +1,10 @@
-#include <gtest/gtest-message.h> // for Message
-#include <gtest/gtest-test-part.h> // for TestPartResult
-#include <memory> // for shared_ptr, __shared_ptr_access, allocator, make_shared
+#include <gtest/gtest-message.h> // for Message
+#include <gtest/gtest-test-part.h> // for SuiteApiResolver, TestPartResult, TestFactoryImpl
+#include <functional> // for function
+#include <vector> // for allocator, vector
-#include "ftxui/component/captured_mouse.hpp" // for ftxui
-#include "ftxui/component/component.hpp" // for Make
-#include "ftxui/component/component_base.hpp" // for ComponentBase, Component
-#include "gtest/gtest_pred_impl.h" // for EXPECT_EQ, Test, SuiteApiResolver, TEST, TestFactoryImpl
+#include "ftxui/component/animation.hpp" // for Function, BackIn, BackInOut, BackOut, BounceIn, BounceInOut, BounceOut, CircularIn, CircularInOut, CircularOut, CubicIn, CubicInOut, CubicOut, ElasticIn, ElasticInOut, ElasticOut, ExponentialIn, ExponentialInOut, ExponentialOut, Linear, QuadraticIn, QuadraticInOut, QuadraticOut, QuarticIn, QuarticInOut, QuarticOut, QuinticIn, QuinticInOut, QuinticOut, SineIn, SineInOut, SineOut
+#include "gtest/gtest_pred_impl.h" // for Test, EXPECT_NEAR, TEST
namespace ftxui {
diff --git a/src/ftxui/component/button_test.cpp b/src/ftxui/component/button_test.cpp
index f727c5b92fe2fe35c151fb9c87796e69212d9200..a2e35f17cd40ea5f74359f4147ff60444c588c27 100644
--- a/src/ftxui/component/button_test.cpp
+++ b/src/ftxui/component/button_test.cpp
@@ -1,16 +1,18 @@
#include <gtest/gtest-message.h> // for Message
#include <gtest/gtest-test-part.h> // for TestPartResult, SuiteApiResolver, TestFactoryImpl
-#include <memory> // for allocator, __shared_ptr_access, shared_ptr
-#include <string> // for string, basic_string
-#include <vector> // for vector
+#include <chrono> // for operator""s, chrono_literals
+#include <memory> // for __shared_ptr_access, shared_ptr, allocator
+#include <string> // for string
-#include "ftxui/component/captured_mouse.hpp" // for ftxui
-#include "ftxui/component/component.hpp" // for container
+#include "ftxui/component/animation.hpp" // for Duration, Params
+#include "ftxui/component/component.hpp" // for Button, Horizontal
#include "ftxui/component/component_base.hpp" // for ComponentBase
-#include "ftxui/component/component_options.hpp" // for MenuOption
-#include "ftxui/component/event.hpp" // for Event, Event::ArrowDown, Event::Return
-#include "ftxui/util/ref.hpp" // for Ref
-#include "gtest/gtest_pred_impl.h" // for Test, EXPECT_EQ, TEST
+#include "ftxui/component/component_options.hpp" // for ButtonOption
+#include "ftxui/component/event.hpp" // for Event, Event::Return, Event::ArrowLeft, Event::ArrowRight
+#include "ftxui/component/mouse.hpp" // for Mouse, Mouse::Left, Mouse::Pressed
+#include "ftxui/dom/node.hpp" // for Render
+#include "ftxui/screen/screen.hpp" // for Screen
+#include "gtest/gtest_pred_impl.h" // for AssertionResult, EXPECT_EQ, Test, EXPECT_FALSE, EXPECT_TRUE, TEST
namespace ftxui {
@@ -45,10 +47,12 @@ TEST(ButtonTest, Basic) {
});
int selected = 0;
- auto container = Container::Horizontal({
- btn1,
- btn2,
- }, &selected);
+ auto container = Container::Horizontal(
+ {
+ btn1,
+ btn2,
+ },
+ &selected);
(void)container->Render();
@@ -93,20 +97,28 @@ TEST(ButtonTest, Animation) {
int press_count = 0;
std::string last_press = "";
auto option = ButtonOption::Animated();
- auto btn1 = Button("btn1", [&] {
- press_count++;
- last_press = "btn1";
- }, option);
- auto btn2 = Button("btn2", [&] {
- press_count++;
- last_press = "btn2";
- }, option);
+ auto btn1 = Button(
+ "btn1",
+ [&] {
+ press_count++;
+ last_press = "btn1";
+ },
+ option);
+ auto btn2 = Button(
+ "btn2",
+ [&] {
+ press_count++;
+ last_press = "btn2";
+ },
+ option);
int selected = 0;
- auto container = Container::Horizontal({
- btn1,
- btn2,
- }, &selected);
+ auto container = Container::Horizontal(
+ {
+ btn1,
+ btn2,
+ },
+ &selected);
{
Screen screen(12, 3);
diff --git a/src/ftxui/component/collapsible_test.cpp b/src/ftxui/component/collapsible_test.cpp
index a00adbeac64fae8be38347ac060f3b735815981c..7eb7323a7841762670697661d3721c2a27b84313 100644
--- a/src/ftxui/component/collapsible_test.cpp
+++ b/src/ftxui/component/collapsible_test.cpp
@@ -1,16 +1,14 @@
#include <gtest/gtest-message.h> // for Message
#include <gtest/gtest-test-part.h> // for TestPartResult, SuiteApiResolver, TestFactoryImpl
-#include <memory> // for allocator, __shared_ptr_access, shared_ptr
-#include <string> // for string, basic_string
-#include <vector> // for vector
-
-#include "ftxui/component/captured_mouse.hpp" // for ftxui
-#include "ftxui/component/component.hpp" // for collapsible
-#include "ftxui/component/component_base.hpp" // for ComponentBase
-#include "ftxui/component/component_options.hpp" // for MenuOption
-#include "ftxui/component/event.hpp" // for Event, Event::ArrowDown, Event::Return
-#include "ftxui/util/ref.hpp" // for Ref
-#include "gtest/gtest_pred_impl.h" // for Test, EXPECT_EQ, TEST
+#include <memory> // for __shared_ptr_access, shared_ptr, allocator
+
+#include "ftxui/component/component.hpp" // for Collapsible, Renderer
+#include "ftxui/component/component_base.hpp" // for ComponentBase
+#include "ftxui/component/event.hpp" // for Event, Event::Return, Event::ArrowDown
+#include "ftxui/dom/elements.hpp" // for text, Element
+#include "ftxui/dom/node.hpp" // for Render
+#include "ftxui/screen/screen.hpp" // for Screen
+#include "gtest/gtest_pred_impl.h" // for AssertionResult, Test, EXPECT_EQ, EXPECT_FALSE, EXPECT_TRUE, TEST
namespace ftxui {
diff --git a/src/ftxui/component/component_test.cpp b/src/ftxui/component/component_test.cpp
index 8c0029ae1c7169aa2337b3c25cdfa60a794dc34b..52c888b894b967f84be532595db35b227d844b69 100644
--- a/src/ftxui/component/component_test.cpp
+++ b/src/ftxui/component/component_test.cpp
@@ -1,11 +1,10 @@
-#include <gtest/gtest-message.h> // for Message
-#include <gtest/gtest-test-part.h> // for TestPartResult
-#include <memory> // for shared_ptr, __shared_ptr_access, allocator, make_shared
+#include <gtest/gtest-message.h> // for Message
+#include <gtest/gtest-test-part.h> // for TestPartResult, SuiteApiResolver, TestFactoryImpl
+#include <memory> // for shared_ptr, __shared_ptr_access, allocator, __shared_ptr_access<>::element_type, make_shared
-#include "ftxui/component/captured_mouse.hpp" // for ftxui
#include "ftxui/component/component.hpp" // for Make
#include "ftxui/component/component_base.hpp" // for ComponentBase, Component
-#include "gtest/gtest_pred_impl.h" // for EXPECT_EQ, Test, SuiteApiResolver, TEST, TestFactoryImpl
+#include "gtest/gtest_pred_impl.h" // for EXPECT_EQ, Test, AssertionResult, TEST, EXPECT_FALSE
namespace ftxui {
diff --git a/src/ftxui/component/container_test.cpp b/src/ftxui/component/container_test.cpp
index 902d4a3b5aa4caddd08e5363527ce297e76fc136..b358a72174dbd40d3f5b70b810baa42bcdb7334f 100644
--- a/src/ftxui/component/container_test.cpp
+++ b/src/ftxui/component/container_test.cpp
@@ -2,9 +2,8 @@
#include <gtest/gtest-test-part.h> // for TestPartResult, SuiteApiResolver, TestFactoryImpl
#include <memory> // for __shared_ptr_access, shared_ptr, allocator
-#include "ftxui/component/captured_mouse.hpp" // for ftxui
-#include "ftxui/component/component.hpp" // for Horizontal, Vertical
-#include "ftxui/component/component_base.hpp" // for ComponentBase
+#include "ftxui/component/component.hpp" // for Horizontal, Vertical, Button, Tab
+#include "ftxui/component/component_base.hpp" // for ComponentBase, Component
#include "ftxui/component/event.hpp" // for Event, Event::Tab, Event::TabReverse, Event::ArrowDown, Event::ArrowLeft, Event::ArrowRight, Event::ArrowUp
#include "gtest/gtest_pred_impl.h" // for AssertionResult, EXPECT_EQ, EXPECT_FALSE, EXPECT_TRUE, Test, TEST
diff --git a/src/ftxui/component/input_test.cpp b/src/ftxui/component/input_test.cpp
index 0621c0452b06c306178d8acd1ffdb7cdeca873ae..635a9fc8a8207df8150152ea23c55d367238392a 100644
--- a/src/ftxui/component/input_test.cpp
+++ b/src/ftxui/component/input_test.cpp
@@ -3,7 +3,6 @@
#include <memory> // for __shared_ptr_access, shared_ptr, allocator
#include <string> // for string
-#include "ftxui/component/captured_mouse.hpp" // for ftxui
#include "ftxui/component/component.hpp" // for Input
#include "ftxui/component/component_base.hpp" // for ComponentBase, Component
#include "ftxui/component/component_options.hpp" // for InputOption
@@ -13,7 +12,7 @@
#include "ftxui/dom/node.hpp" // for Render
#include "ftxui/screen/screen.hpp" // for Fixed, Screen, Pixel
#include "ftxui/util/ref.hpp" // for Ref
-#include "gtest/gtest_pred_impl.h" // for Test, EXPECT_EQ, TEST
+#include "gtest/gtest_pred_impl.h" // for EXPECT_EQ, Test, TEST
namespace ftxui {
diff --git a/src/ftxui/component/menu_test.cpp b/src/ftxui/component/menu_test.cpp
index 5bfa651ed61f77086a083c00f29de410db92d423..05d5aff22ebe2324d24a4bc4d84a47c345d3dac9 100644
--- a/src/ftxui/component/menu_test.cpp
+++ b/src/ftxui/component/menu_test.cpp
@@ -1,16 +1,19 @@
#include <gtest/gtest-message.h> // for Message
#include <gtest/gtest-test-part.h> // for TestPartResult, SuiteApiResolver, TestFactoryImpl
-#include <memory> // for allocator, __shared_ptr_access, shared_ptr
-#include <string> // for string, basic_string
+#include <chrono> // for operator""s, chrono_literals
+#include <memory> // for __shared_ptr_access, shared_ptr, allocator
+#include <string> // for string
#include <vector> // for vector
-#include "ftxui/component/captured_mouse.hpp" // for ftxui
+#include "ftxui/component/animation.hpp" // for Duration, Params
#include "ftxui/component/component.hpp" // for Menu
#include "ftxui/component/component_base.hpp" // for ComponentBase
-#include "ftxui/component/component_options.hpp" // for MenuOption
-#include "ftxui/component/event.hpp" // for Event, Event::ArrowDown, Event::Return
+#include "ftxui/component/component_options.hpp" // for MenuOption, MenuOption::Down, MenuOption::Left, MenuOption::Right, MenuOption::Up
+#include "ftxui/component/event.hpp" // for Event, Event::ArrowDown, Event::ArrowLeft, Event::ArrowRight, Event::ArrowUp, Event::Return
+#include "ftxui/dom/node.hpp" // for Render
+#include "ftxui/screen/screen.hpp" // for Screen
#include "ftxui/util/ref.hpp" // for Ref
-#include "gtest/gtest_pred_impl.h" // for Test, EXPECT_EQ, TEST
+#include "gtest/gtest_pred_impl.h" // for EXPECT_EQ, Test, TEST
namespace ftxui {
diff --git a/src/ftxui/component/radiobox_test.cpp b/src/ftxui/component/radiobox_test.cpp
index d057560c40624889a78e65316691d0bfd67e9136..d8863f5896233f6beac75c9c0109a9a6b4b666c4 100644
--- a/src/ftxui/component/radiobox_test.cpp
+++ b/src/ftxui/component/radiobox_test.cpp
@@ -1,10 +1,9 @@
#include <gtest/gtest-message.h> // for Message
#include <gtest/gtest-test-part.h> // for TestPartResult, SuiteApiResolver, TestFactoryImpl
#include <memory> // for __shared_ptr_access, shared_ptr, allocator
-#include <string> // for string, basic_string
+#include <string> // for string
#include <vector> // for vector
-#include "ftxui/component/captured_mouse.hpp" // for ftxui
#include "ftxui/component/component.hpp" // for Radiobox
#include "ftxui/component/component_base.hpp" // for ComponentBase
#include "ftxui/component/component_options.hpp" // for RadioboxOption
diff --git a/src/ftxui/component/resizable_split_test.cpp b/src/ftxui/component/resizable_split_test.cpp
index f9b9f110955b8df22f4fdba80dee722d74e614db..28595bab97a64de286c3d5df82faae452483eaea 100644
--- a/src/ftxui/component/resizable_split_test.cpp
+++ b/src/ftxui/component/resizable_split_test.cpp
@@ -1,16 +1,15 @@
#include <gtest/gtest-message.h> // for Message
#include <gtest/gtest-test-part.h> // for TestPartResult, SuiteApiResolver, TestFactoryImpl
#include <memory> // for __shared_ptr_access, shared_ptr, allocator
-#include <string> // for string, basic_string
-#include <vector> // for vector
-#include "ftxui/component/captured_mouse.hpp" // for ftxui
-#include "ftxui/component/component.hpp" // for Radiobox
-#include "ftxui/component/component_base.hpp" // for ComponentBase
-#include "ftxui/component/component_options.hpp" // for RadioboxOption
-#include "ftxui/component/event.hpp" // for Event, Event::Return, Event::ArrowDown, Event::ArrowUp, Event::Tab, Event::TabReverse
-#include "ftxui/util/ref.hpp" // for Ref
-#include "gtest/gtest_pred_impl.h" // for EXPECT_EQ, Test, TEST
+#include "ftxui/component/component.hpp" // for Renderer, ResizableSplitBottom, ResizableSplitLeft, ResizableSplitRight, ResizableSplitTop
+#include "ftxui/component/component_base.hpp" // for ComponentBase, Component
+#include "ftxui/component/event.hpp" // for Event
+#include "ftxui/component/mouse.hpp" // for Mouse, Mouse::Left, Mouse::Pressed, Mouse::Released
+#include "ftxui/dom/elements.hpp" // for text, Element
+#include "ftxui/dom/node.hpp" // for Render
+#include "ftxui/screen/screen.hpp" // for Screen
+#include "gtest/gtest_pred_impl.h" // for AssertionResult, Test, EXPECT_EQ, EXPECT_TRUE, TEST
namespace ftxui {
diff --git a/src/ftxui/component/terminal_input_parser.hpp b/src/ftxui/component/terminal_input_parser.hpp
index 5449b1e4029402fd8c07618dc697bbfdc972ffe0..1c82d722f53368641e5196a10a52e468468856eb 100644
--- a/src/ftxui/component/terminal_input_parser.hpp
+++ b/src/ftxui/component/terminal_input_parser.hpp
@@ -7,7 +7,7 @@
#include "ftxui/component/event.hpp" // for Event (ptr only)
#include "ftxui/component/mouse.hpp" // for Mouse
-#include "ftxui/component/receiver.hpp" // for Sender
+#include "ftxui/component/receiver.hpp" // for SenderImpl
#include "ftxui/component/task.hpp" // for Task
namespace ftxui {
diff --git a/src/ftxui/component/terminal_input_parser_test.cpp b/src/ftxui/component/terminal_input_parser_test.cpp
index 3611b22f637a79d8822f74cb541518e071e0a67f..0abb28dd41cf855f9cf96bf28fd0e22986e81c91 100644
--- a/src/ftxui/component/terminal_input_parser_test.cpp
+++ b/src/ftxui/component/terminal_input_parser_test.cpp
@@ -1,13 +1,14 @@
#include <gtest/gtest-message.h> // for Message
#include <gtest/gtest-test-part.h> // for TestPartResult, SuiteApiResolver, TestFactoryImpl
#include <algorithm> // for max
-#include <memory> // for unique_ptr, allocator
-#include <variant> // for get
+#include <initializer_list> // for initializer_list
+#include <memory> // for unique_ptr, allocator
+#include <variant> // for get
-#include "ftxui/component/event.hpp" // for Event, Event::Escape
+#include "ftxui/component/event.hpp" // for Event, Event::Return, Event::ArrowDown, Event::ArrowLeft, Event::ArrowRight, Event::ArrowUp, Event::Backspace, Event::Custom, Event::Delete, Event::End, Event::Escape, Event::F10, Event::F11, Event::F12, Event::F5, Event::F6, Event::F7, Event::F8, Event::F9, Event::Home, Event::PageDown, Event::PageUp, Event::Tab, Event::TabReverse
#include "ftxui/component/receiver.hpp" // for MakeReceiver, ReceiverImpl
#include "ftxui/component/terminal_input_parser.hpp"
-#include "gtest/gtest_pred_impl.h" // for AssertionResult, Test, EXPECT_EQ, EXPECT_TRUE, EXPECT_FALSE, TEST
+#include "gtest/gtest_pred_impl.h" // for AssertionResult, Test, EXPECT_EQ, EXPECT_TRUE, TEST, EXPECT_FALSE
namespace ftxui {
diff --git a/src/ftxui/dom/benchmark_test.cpp b/src/ftxui/dom/benchmark_test.cpp
index 76a028de5b57eb9a8c5546d6d48aeb5e038690ed..740e8f565ab1e7fbd01358fbbcf2afc2e317c0a9 100644
--- a/src/ftxui/dom/benchmark_test.cpp
+++ b/src/ftxui/dom/benchmark_test.cpp
@@ -1,8 +1,7 @@
#include <benchmark/benchmark.h>
-#include "ftxui/dom/elements.hpp" // for separator, gauge, operator|, text, Element, blink, inverted, hbox, vbox, border
+#include "ftxui/dom/elements.hpp" // for gauge, separator, operator|, text, Element, hbox, vbox, blink, border, inverted
#include "ftxui/dom/node.hpp" // for Render
-#include "ftxui/screen/color.hpp" // for ftxui
#include "ftxui/screen/screen.hpp" // for Screen
namespace ftxui {
diff --git a/src/ftxui/dom/blink_test.cpp b/src/ftxui/dom/blink_test.cpp
index a44511786db120bdec29c9dcc023c44a16025910..8bbe423403255bd26f6ce5677f11368bf4709e13 100644
--- a/src/ftxui/dom/blink_test.cpp
+++ b/src/ftxui/dom/blink_test.cpp
@@ -1,9 +1,11 @@
#include <gtest/gtest-message.h> // for Message
#include <gtest/gtest-test-part.h> // for SuiteApiResolver, TestFactoryImpl, TestPartResult
-#include <string> // for allocator
-#include "ftxui/dom/elements.hpp" // for text, flexbox
-#include "ftxui/screen/screen.hpp" // for Screen
-#include "gtest/gtest_pred_impl.h" // for Test, EXPECT_EQ, TEST
+#include <gtest/gtest.h> // for Test, AssertionResult, TestInfo (ptr only), EXPECT_TRUE, TEST
+#include <string> // for allocator
+
+#include "ftxui/dom/elements.hpp" // for operator|, text, blink, Element
+#include "ftxui/dom/node.hpp" // for Render
+#include "ftxui/screen/screen.hpp" // for Screen, Pixel
namespace ftxui {
diff --git a/src/ftxui/dom/bold_test.cpp b/src/ftxui/dom/bold_test.cpp
index ff8ccee900bf13d59c83659500ff64b3ce555159..fac4431a76a9645055d441cb51cd64a953668001 100644
--- a/src/ftxui/dom/bold_test.cpp
+++ b/src/ftxui/dom/bold_test.cpp
@@ -1,9 +1,11 @@
#include <gtest/gtest-message.h> // for Message
#include <gtest/gtest-test-part.h> // for SuiteApiResolver, TestFactoryImpl, TestPartResult
-#include <string> // for allocator
-#include "ftxui/dom/elements.hpp" // for text, flexbox
-#include "ftxui/screen/screen.hpp" // for Screen
-#include "gtest/gtest_pred_impl.h" // for Test, EXPECT_EQ, TEST
+#include <gtest/gtest.h> // for Test, AssertionResult, TestInfo (ptr only), EXPECT_TRUE, TEST
+#include <string> // for allocator
+
+#include "ftxui/dom/elements.hpp" // for operator|, text, bold, Element
+#include "ftxui/dom/node.hpp" // for Render
+#include "ftxui/screen/screen.hpp" // for Screen, Pixel
namespace ftxui {
diff --git a/src/ftxui/dom/border_test.cpp b/src/ftxui/dom/border_test.cpp
index 501ef6bc9451d9a55d9222920705ebfd7052317a..e6ff25e80dc85e805a57647dd3bb8ffe773ec99d 100644
--- a/src/ftxui/dom/border_test.cpp
+++ b/src/ftxui/dom/border_test.cpp
@@ -1,8 +1,10 @@
#include <gtest/gtest-message.h> // for Message
#include <gtest/gtest-test-part.h> // for SuiteApiResolver, TestFactoryImpl, TestPartResult
-#include <string> // for allocator
-#include "ftxui/dom/elements.hpp" // for text, flexbox
-#include "ftxui/screen/screen.hpp" // for Screen
+#include <string> // for allocator, string
+
+#include "ftxui/dom/elements.hpp" // for text, operator|, Element, borderStyled, borderWith, window, border, borderDouble, borderEmpty, borderHeavy, borderLight, borderRounded, DOUBLE
+#include "ftxui/dom/node.hpp" // for Render
+#include "ftxui/screen/screen.hpp" // for Screen, Pixel
#include "gtest/gtest_pred_impl.h" // for Test, EXPECT_EQ, TEST
namespace ftxui {
diff --git a/src/ftxui/dom/canvas_test.cpp b/src/ftxui/dom/canvas_test.cpp
index e1fff8252fe3bb11cbc57c3bc474790cee7f75d5..fe85b0a42736b4f7e65f6d5582a34342aac17545 100644
--- a/src/ftxui/dom/canvas_test.cpp
+++ b/src/ftxui/dom/canvas_test.cpp
@@ -1,9 +1,15 @@
#include <gtest/gtest-message.h> // for Message
#include <gtest/gtest-test-part.h> // for SuiteApiResolver, TestFactoryImpl, TestPartResult
-#include <string> // for allocator
-#include "ftxui/dom/elements.hpp" // for text, flexbox
-#include "ftxui/screen/screen.hpp" // for Screen
-#include "gtest/gtest_pred_impl.h" // for Test, EXPECT_EQ, TEST
+#include <stdint.h> // for uint32_t
+#include <string> // for allocator, string
+
+#include "ftxui/dom/canvas.hpp" // for Canvas
+#include "ftxui/dom/elements.hpp" // for canvas
+#include "ftxui/dom/node.hpp" // for Render
+#include "ftxui/screen/color.hpp" // for Color, Color::Black, Color::Blue, Color::Red, Color::White, Color::Yellow, Color::Cyan, Color::Green
+#include "ftxui/screen/screen.hpp" // for Screen
+#include "ftxui/screen/terminal.hpp" // for SetColorSupport, Color, TrueColor
+#include "gtest/gtest_pred_impl.h" // for Test, EXPECT_EQ, TEST
namespace ftxui {
diff --git a/src/ftxui/dom/color_test.cpp b/src/ftxui/dom/color_test.cpp
index c40280406cdc54175cb995462baf80b30cfb1c04..2c772d63bf2acbbbdb26e56b7cbe8c57617badc7 100644
--- a/src/ftxui/dom/color_test.cpp
+++ b/src/ftxui/dom/color_test.cpp
@@ -1,8 +1,11 @@
#include <gtest/gtest-message.h> // for Message
-#include <gtest/gtest-test-part.h> // for SuiteApiResolver, TestFactoryImpl, TestPartResult
+#include <gtest/gtest-test-part.h> // for SuiteApiResolver, TestPartResult, TestFactoryImpl
#include <string> // for allocator
-#include "ftxui/dom/elements.hpp" // for text, flexbox
-#include "ftxui/screen/screen.hpp" // for Screen
+
+#include "ftxui/dom/elements.hpp" // for operator|, text, bgcolor, color, Element
+#include "ftxui/dom/node.hpp" // for Render
+#include "ftxui/screen/color.hpp" // for Color, Color::Red
+#include "ftxui/screen/screen.hpp" // for Screen, Pixel
#include "gtest/gtest_pred_impl.h" // for Test, EXPECT_EQ, TEST
namespace ftxui {
diff --git a/src/ftxui/dom/dbox.cpp b/src/ftxui/dom/dbox.cpp
index 4efdb1360bcb51cdff93cc43dd551669e1071d42..6bfc128845e2923d6d7d355d5595c24cb382d0b4 100644
--- a/src/ftxui/dom/dbox.cpp
+++ b/src/ftxui/dom/dbox.cpp
@@ -1,10 +1,9 @@
#include <algorithm> // for max
#include <memory> // for __shared_ptr_access, shared_ptr, make_shared
#include <utility> // for move
-#include <vector> // for vector
#include "ftxui/dom/elements.hpp" // for Element, Elements, dbox
-#include "ftxui/dom/node.hpp" // for Node
+#include "ftxui/dom/node.hpp" // for Node, Elements
#include "ftxui/dom/requirement.hpp" // for Requirement
#include "ftxui/screen/box.hpp" // for Box
diff --git a/src/ftxui/dom/dbox_test.cpp b/src/ftxui/dom/dbox_test.cpp
index 159ea311b1e508597ae72a16ea4842783d61bc6d..d12871e78ce377e392356ba4de932567931625c9 100644
--- a/src/ftxui/dom/dbox_test.cpp
+++ b/src/ftxui/dom/dbox_test.cpp
@@ -1,12 +1,9 @@
#include <gtest/gtest-message.h> // for Message
#include <gtest/gtest-test-part.h> // for SuiteApiResolver, TestFactoryImpl, TestPartResult
-#include <algorithm> // for remove
-#include <string> // for allocator, basic_string, string
-#include <vector> // for vector
+#include <string> // for allocator
-#include "ftxui/dom/elements.hpp" // for vtext, operator|, Element, flex_grow, flex_shrink, vbox
+#include "ftxui/dom/elements.hpp" // for filler, operator|, text, border, dbox, hbox, vbox, Element
#include "ftxui/dom/node.hpp" // for Render
-#include "ftxui/screen/color.hpp" // for ftxui
#include "ftxui/screen/screen.hpp" // for Screen
#include "gtest/gtest_pred_impl.h" // for Test, EXPECT_EQ, TEST
diff --git a/src/ftxui/dom/dim_test.cpp b/src/ftxui/dom/dim_test.cpp
index a64c4a697e4c84426b491e3c2c231b908b6cdf96..312c1fe0919011f40a68625b82c758b0fe613d97 100644
--- a/src/ftxui/dom/dim_test.cpp
+++ b/src/ftxui/dom/dim_test.cpp
@@ -1,9 +1,11 @@
#include <gtest/gtest-message.h> // for Message
#include <gtest/gtest-test-part.h> // for SuiteApiResolver, TestFactoryImpl, TestPartResult
-#include <string> // for allocator
-#include "ftxui/dom/elements.hpp" // for text, flexbox
-#include "ftxui/screen/screen.hpp" // for Screen
-#include "gtest/gtest_pred_impl.h" // for Test, EXPECT_EQ, TEST
+#include <gtest/gtest.h> // for Test, AssertionResult, TestInfo (ptr only), EXPECT_TRUE, TEST
+#include <string> // for allocator
+
+#include "ftxui/dom/elements.hpp" // for operator|, text, dim, Element
+#include "ftxui/dom/node.hpp" // for Render
+#include "ftxui/screen/screen.hpp" // for Screen, Pixel
namespace ftxui {
diff --git a/src/ftxui/dom/flexbox_test.cpp b/src/ftxui/dom/flexbox_test.cpp
index 841711ff55b0f1e8de109c4a8c19539873f189ae..78fff80d85448cdfe601157d4bda32951363df69 100644
--- a/src/ftxui/dom/flexbox_test.cpp
+++ b/src/ftxui/dom/flexbox_test.cpp
@@ -5,7 +5,6 @@
#include "ftxui/dom/elements.hpp" // for text, flexbox
#include "ftxui/dom/flexbox_config.hpp" // for FlexboxConfig, FlexboxConfig::Direction, FlexboxConfig::AlignContent, FlexboxConfig::JustifyContent, FlexboxConfig::Direction::Column, FlexboxConfig::AlignItems, FlexboxConfig::JustifyContent::SpaceAround, FlexboxConfig::AlignContent::Center, FlexboxConfig::AlignContent::FlexEnd, FlexboxConfig::AlignContent::SpaceAround, FlexboxConfig::AlignContent::SpaceBetween, FlexboxConfig::AlignContent::SpaceEvenly, FlexboxConfig::AlignItems::Center, FlexboxConfig::AlignItems::FlexEnd, FlexboxConfig::Direction::ColumnInversed, FlexboxConfig::Direction::Row, FlexboxConfig::Direction::RowInversed, FlexboxConfig::JustifyContent::Center, FlexboxConfig::JustifyContent::SpaceBetween
#include "ftxui/dom/node.hpp" // for Render
-#include "ftxui/screen/color.hpp" // for ftxui
#include "ftxui/screen/screen.hpp" // for Screen
#include "gtest/gtest_pred_impl.h" // for Test, EXPECT_EQ, TEST
diff --git a/src/ftxui/dom/gauge_test.cpp b/src/ftxui/dom/gauge_test.cpp
index 454850e00a7a64bb7c7b41cb35a504ace3ae6fe9..e8a8b9d5917124f7ef8184ec05a4e95baa9686fe 100644
--- a/src/ftxui/dom/gauge_test.cpp
+++ b/src/ftxui/dom/gauge_test.cpp
@@ -2,9 +2,8 @@
#include <gtest/gtest-test-part.h> // for SuiteApiResolver, TestFactoryImpl, TestPartResult
#include <memory> // for allocator
-#include "ftxui/dom/elements.hpp" // for gauge
+#include "ftxui/dom/elements.hpp" // for gauge, gaugeUp
#include "ftxui/dom/node.hpp" // for Render
-#include "ftxui/screen/color.hpp" // for ftxui
#include "ftxui/screen/screen.hpp" // for Screen
#include "gtest/gtest_pred_impl.h" // for Test, EXPECT_EQ, TEST
diff --git a/src/ftxui/dom/gridbox_test.cpp b/src/ftxui/dom/gridbox_test.cpp
index 30c6e4c9d6a7ae76897dd96498e9e74e42278541..19a8f8b162d284ffca86b337ffff1b916fa91eca 100644
--- a/src/ftxui/dom/gridbox_test.cpp
+++ b/src/ftxui/dom/gridbox_test.cpp
@@ -1,12 +1,12 @@
#include <gtest/gtest-message.h> // for Message
#include <gtest/gtest-test-part.h> // for SuiteApiResolver, TestFactoryImpl, TestPartResult
+#include <stddef.h> // for size_t
#include <algorithm> // for remove
-#include <string> // for allocator, basic_string, string
+#include <string> // for string, allocator, basic_string
#include <vector> // for vector
-#include "ftxui/dom/elements.hpp" // for text, operator|, Element, flex, Elements, flex_grow, flex_shrink, vtext, gridbox, vbox, border
+#include "ftxui/dom/elements.hpp" // for text, operator|, Elements, gridbox, Element, flex, flex_grow, flex_shrink, vtext, vbox, border
#include "ftxui/dom/node.hpp" // for Render
-#include "ftxui/screen/color.hpp" // for ftxui
#include "ftxui/screen/screen.hpp" // for Screen
#include "gtest/gtest_pred_impl.h" // for Test, TEST, EXPECT_EQ
diff --git a/src/ftxui/dom/hbox_test.cpp b/src/ftxui/dom/hbox_test.cpp
index 05fefe1da3585df03968b87f2ea8770323544d51..f78a81301e5aed895ab41fcf2d0abab88fc0627e 100644
--- a/src/ftxui/dom/hbox_test.cpp
+++ b/src/ftxui/dom/hbox_test.cpp
@@ -1,9 +1,10 @@
#include <gtest/gtest-message.h> // for Message
#include <gtest/gtest-test-part.h> // for SuiteApiResolver, TestFactoryImpl, TestPartResult
-#include <string> // for allocator, basic_string, string
+#include <stddef.h> // for size_t
+#include <string> // for string, allocator
#include <vector> // for vector
-#include "ftxui/dom/elements.hpp" // for text, operator|, Element, flex_grow, flex_shrink, hbox
+#include "ftxui/dom/elements.hpp" // for text, operator|, hbox, Element, flex_grow, flex_shrink
#include "ftxui/dom/node.hpp" // for Render
#include "ftxui/screen/color.hpp" // for ftxui
#include "ftxui/screen/screen.hpp" // for Screen
diff --git a/src/ftxui/dom/scroll_indicator_test.cpp b/src/ftxui/dom/scroll_indicator_test.cpp
index 6272df1b82fc911fc82d48a02af0115660b6274b..665ec758e5ccaf9ecd97c7349ae3bbd22d84c7e3 100644
--- a/src/ftxui/dom/scroll_indicator_test.cpp
+++ b/src/ftxui/dom/scroll_indicator_test.cpp
@@ -1,9 +1,13 @@
#include <gtest/gtest-message.h> // for Message
-#include <gtest/gtest-test-part.h> // for SuiteApiResolver, TestFactoryImpl, TestPartResult
-#include <string> // for allocator
-#include "ftxui/dom/elements.hpp" // for text, flexbox
+#include <gtest/gtest-test-part.h> // for TestPartResult, SuiteApiResolver, TestFactoryImpl
+#include <memory> // for shared_ptr
+#include <string> // for allocator, to_string, string
+#include <utility> // for move
+
+#include "ftxui/dom/elements.hpp" // for operator|, Element, operator|=, text, vbox, Elements, border, focus, frame, vscroll_indicator
+#include "ftxui/dom/node.hpp" // for Render
#include "ftxui/screen/screen.hpp" // for Screen
-#include "gtest/gtest_pred_impl.h" // for Test, EXPECT_EQ, TEST
+#include "gtest/gtest_pred_impl.h" // for EXPECT_EQ, Test, TEST
namespace ftxui {
diff --git a/src/ftxui/dom/separator_test.cpp b/src/ftxui/dom/separator_test.cpp
index eb0a25f7ed69aea3023dc0b5f1d25ea37f3f92fe..fe3f51caa8938b8fa8e0e1297e75037bb7d55630 100644
--- a/src/ftxui/dom/separator_test.cpp
+++ b/src/ftxui/dom/separator_test.cpp
@@ -1,8 +1,10 @@
#include <gtest/gtest-message.h> // for Message
#include <gtest/gtest-test-part.h> // for SuiteApiResolver, TestFactoryImpl, TestPartResult
-#include <string> // for allocator
-#include "ftxui/dom/elements.hpp" // for text, flexbox
-#include "ftxui/screen/screen.hpp" // for Screen
+#include <string> // for allocator, string
+
+#include "ftxui/dom/elements.hpp" // for text, vbox, separator, separatorDouble, separatorEmpty, separatorHeavy, separatorLight, separatorStyled, DOUBLE
+#include "ftxui/dom/node.hpp" // for Render
+#include "ftxui/screen/screen.hpp" // for Screen, Pixel
#include "gtest/gtest_pred_impl.h" // for Test, EXPECT_EQ, TEST
namespace ftxui {
diff --git a/src/ftxui/dom/spinner_test.cpp b/src/ftxui/dom/spinner_test.cpp
index 5c5b91887ddc488db05fc48d7288fd0c82be02f1..d7769310081e4b04c17461bbcffc5333e8e5b95c 100644
--- a/src/ftxui/dom/spinner_test.cpp
+++ b/src/ftxui/dom/spinner_test.cpp
@@ -1,7 +1,9 @@
#include <gtest/gtest-message.h> // for Message
#include <gtest/gtest-test-part.h> // for SuiteApiResolver, TestFactoryImpl, TestPartResult
#include <string> // for allocator
-#include "ftxui/dom/elements.hpp" // for text, flexbox
+
+#include "ftxui/dom/elements.hpp" // for spinner
+#include "ftxui/dom/node.hpp" // for Render
#include "ftxui/screen/screen.hpp" // for Screen
#include "gtest/gtest_pred_impl.h" // for Test, EXPECT_EQ, TEST
diff --git a/src/ftxui/dom/table_test.cpp b/src/ftxui/dom/table_test.cpp
index b055d27411ac4f4198fa008f3de3eba8c5dd3709..c9b28c3b264da03679e9cf2bfbfe51370340a4d1 100644
--- a/src/ftxui/dom/table_test.cpp
+++ b/src/ftxui/dom/table_test.cpp
@@ -5,7 +5,6 @@
#include "ftxui/dom/elements.hpp" // for LIGHT, flex, center, EMPTY, DOUBLE
#include "ftxui/dom/node.hpp" // for Render
#include "ftxui/dom/table.hpp"
-#include "ftxui/screen/color.hpp" // for ftxui
#include "ftxui/screen/screen.hpp" // for Screen
#include "gtest/gtest_pred_impl.h" // for Test, EXPECT_EQ, TEST
diff --git a/src/ftxui/dom/text_test.cpp b/src/ftxui/dom/text_test.cpp
index 10ba7ccb7847c24ab8415b674510d10e5bd12853..50f24bfebd6e8bf5bac3cbd27b65d88f11b3dd77 100644
--- a/src/ftxui/dom/text_test.cpp
+++ b/src/ftxui/dom/text_test.cpp
@@ -4,7 +4,6 @@
#include "ftxui/dom/elements.hpp" // for text, operator|, border, Element
#include "ftxui/dom/node.hpp" // for Render
-#include "ftxui/screen/color.hpp" // for ftxui
#include "ftxui/screen/screen.hpp" // for Screen
#include "gtest/gtest_pred_impl.h" // for Test, EXPECT_EQ, TEST
diff --git a/src/ftxui/dom/underlined_test.cpp b/src/ftxui/dom/underlined_test.cpp
index 2109a4cf46f847c8e56e1431e073eb3f77fdc3ee..0c7134143b318095568413fa1eea827e8d4189c8 100644
--- a/src/ftxui/dom/underlined_test.cpp
+++ b/src/ftxui/dom/underlined_test.cpp
@@ -1,9 +1,11 @@
#include <gtest/gtest-message.h> // for Message
#include <gtest/gtest-test-part.h> // for SuiteApiResolver, TestFactoryImpl, TestPartResult
-#include <string> // for allocator
-#include "ftxui/dom/elements.hpp" // for text, flexbox
-#include "ftxui/screen/screen.hpp" // for Screen
-#include "gtest/gtest_pred_impl.h" // for Test, EXPECT_EQ, TEST
+#include <gtest/gtest.h> // for Test, AssertionResult, TestInfo (ptr only), EXPECT_TRUE, TEST
+#include <string> // for allocator
+
+#include "ftxui/dom/elements.hpp" // for operator|, text, underlined, Element
+#include "ftxui/dom/node.hpp" // for Render
+#include "ftxui/screen/screen.hpp" // for Screen, Pixel
namespace ftxui {
diff --git a/src/ftxui/dom/util.cpp b/src/ftxui/dom/util.cpp
index adf6be382a19e5aa7b2d968712d851861d003034..38a82cb74085d926ad84e995575350064afc95fe 100644
--- a/src/ftxui/dom/util.cpp
+++ b/src/ftxui/dom/util.cpp
@@ -2,10 +2,9 @@
#include <functional> // for function
#include <memory> // for __shared_ptr_access, make_unique
#include <utility> // for move
-#include <vector> // for vector
-#include "ftxui/dom/elements.hpp" // for Element, Decorator, Elements, operator|, Fit, emptyElement, nothing
-#include "ftxui/dom/node.hpp" // for Node, Node::Status
+#include "ftxui/dom/elements.hpp" // for Element, Decorator, Elements, operator|, Fit, emptyElement, nothing, operator|=
+#include "ftxui/dom/node.hpp" // for Node, Node::Status
#include "ftxui/dom/requirement.hpp" // for Requirement
#include "ftxui/screen/box.hpp" // for Box
#include "ftxui/screen/screen.hpp" // for Full
diff --git a/src/ftxui/dom/vbox_test.cpp b/src/ftxui/dom/vbox_test.cpp
index 9812c35eac34b6c18ea9c5707b43d10c73e50488..aca59a801d23697a2b1d35c57770906f88c0b3f0 100644
--- a/src/ftxui/dom/vbox_test.cpp
+++ b/src/ftxui/dom/vbox_test.cpp
@@ -1,12 +1,12 @@
#include <gtest/gtest-message.h> // for Message
#include <gtest/gtest-test-part.h> // for SuiteApiResolver, TestFactoryImpl, TestPartResult
+#include <stddef.h> // for size_t
#include <algorithm> // for remove
-#include <string> // for allocator, basic_string, string
+#include <string> // for string, allocator, basic_string
#include <vector> // for vector
-#include "ftxui/dom/elements.hpp" // for vtext, operator|, Element, flex_grow, flex_shrink, vbox
+#include "ftxui/dom/elements.hpp" // for vtext, operator|, vbox, Element, flex_grow, flex_shrink
#include "ftxui/dom/node.hpp" // for Render
-#include "ftxui/screen/color.hpp" // for ftxui
#include "ftxui/screen/screen.hpp" // for Screen
#include "gtest/gtest_pred_impl.h" // for Test, EXPECT_EQ, TEST
diff --git a/tools/iwyu.sh b/tools/iwyu.sh
index 209fc8cab0088007f417906c1235e39c2fdd75fc..88da55e35ce77514c794d3bc9a12b9ffa238405c 100755
--- a/tools/iwyu.sh
+++ b/tools/iwyu.sh
@@ -8,7 +8,6 @@ rm * -rf
echo $CMAKE_CXX_INCLUDE_WHAT_YOU_USE
cmake .. -DFTXUI_BUILD_TESTS=ON -DCMAKE_CXX_INCLUDE_WHAT_YOU_USE="include-what-you-use;-Xiwyu;--cxx17ns;-Xiwyu;--mapping_file=${mapping_dir}/iwyu.imp;-Xiwyu;--verbose=3"
make -j 2>out
-#fix_includes.py --comments < out
-fix_include --comments < out
+fix_includes.py --comments < out
../tools/format.sh