From 34c7322d77ce4dba73d985e4a1869efe58d96564 Mon Sep 17 00:00:00 2001
From: Andreas Kling <kling@serenityos.org>
Date: Fri, 14 Feb 2020 23:53:11 +0100
Subject: [PATCH] LibGUI: Remove some header dependencies from Widget.h

---
 Applications/About/main.cpp                   |  3 ++-
 Applications/FontEditor/GlyphEditorWidget.cpp |  1 +
 Applications/FontEditor/GlyphMapWidget.cpp    |  3 ++-
 Applications/FontEditor/main.cpp              |  1 +
 Applications/HexEditor/HexEditor.h            |  1 +
 Applications/PaintBrush/PaletteWidget.cpp     |  1 +
 Applications/SystemMonitor/GraphWidget.cpp    |  1 +
 .../SystemMonitor/MemoryStatsWidget.cpp       |  3 ++-
 Applications/Terminal/main.cpp                |  1 +
 Applications/Welcome/TextWidget.cpp           |  3 ++-
 Applications/Welcome/main.cpp                 |  1 +
 DevTools/HackStudio/CursorTool.cpp            |  1 +
 DevTools/HackStudio/ProcessStateWidget.cpp    |  1 +
 Games/Snake/SnakeGame.cpp                     |  1 +
 Libraries/LibGUI/AboutDialog.cpp              |  1 +
 Libraries/LibGUI/AbstractTableView.h          |  2 +-
 Libraries/LibGUI/Application.cpp              |  3 ++-
 Libraries/LibGUI/Button.cpp                   |  4 ++-
 Libraries/LibGUI/CheckBox.cpp                 |  7 ++---
 Libraries/LibGUI/ColorPicker.cpp              |  1 +
 Libraries/LibGUI/ColumnsView.cpp              |  3 ++-
 Libraries/LibGUI/Frame.cpp                    |  3 ++-
 Libraries/LibGUI/GroupBox.cpp                 |  5 ++--
 Libraries/LibGUI/Label.cpp                    |  5 ++--
 Libraries/LibGUI/MessageBox.cpp               |  1 +
 Libraries/LibGUI/ProgressBar.cpp              |  1 +
 Libraries/LibGUI/RadioButton.cpp              |  6 +++--
 Libraries/LibGUI/Slider.cpp                   |  1 +
 Libraries/LibGUI/StatusBar.cpp                |  3 ++-
 Libraries/LibGUI/TabWidget.cpp                |  5 ++--
 Libraries/LibGUI/Widget.cpp                   | 17 ++++++++++++
 Libraries/LibGUI/Widget.h                     | 26 +++++++++----------
 Libraries/LibGfx/Forward.h                    |  2 ++
 MenuApplets/Audio/main.cpp                    |  1 +
 MenuApplets/Clock/main.cpp                    |  1 +
 MenuApplets/UserName/main.cpp                 |  1 +
 36 files changed, 86 insertions(+), 35 deletions(-)

diff --git a/Applications/About/main.cpp b/Applications/About/main.cpp
index cc761d7a88..b4803209ac 100644
--- a/Applications/About/main.cpp
+++ b/Applications/About/main.cpp
@@ -30,8 +30,9 @@
 #include <LibGUI/Desktop.h>
 #include <LibGUI/Label.h>
 #include <LibGUI/Window.h>
-#include <sys/utsname.h>
+#include <LibGfx/Font.h>
 #include <stdio.h>
+#include <sys/utsname.h>
 
 int main(int argc, char** argv)
 {
diff --git a/Applications/FontEditor/GlyphEditorWidget.cpp b/Applications/FontEditor/GlyphEditorWidget.cpp
index 8dbb0de9a8..d6b7ff48d1 100644
--- a/Applications/FontEditor/GlyphEditorWidget.cpp
+++ b/Applications/FontEditor/GlyphEditorWidget.cpp
@@ -26,6 +26,7 @@
 
 #include "GlyphEditorWidget.h"
 #include <LibGUI/Painter.h>
+#include <LibGfx/Font.h>
 
 GlyphEditorWidget::GlyphEditorWidget(Gfx::Font& mutable_font, GUI::Widget* parent)
     : GUI::Frame(parent)
diff --git a/Applications/FontEditor/GlyphMapWidget.cpp b/Applications/FontEditor/GlyphMapWidget.cpp
index 3f64194a5b..e8bcf4d908 100644
--- a/Applications/FontEditor/GlyphMapWidget.cpp
+++ b/Applications/FontEditor/GlyphMapWidget.cpp
@@ -25,8 +25,9 @@
  */
 
 #include "GlyphMapWidget.h"
-#include <LibGfx/Palette.h>
 #include <LibGUI/Painter.h>
+#include <LibGfx/Font.h>
+#include <LibGfx/Palette.h>
 
 GlyphMapWidget::GlyphMapWidget(Gfx::Font& mutable_font, GUI::Widget* parent)
     : GUI::Frame(parent)
diff --git a/Applications/FontEditor/main.cpp b/Applications/FontEditor/main.cpp
index fded4827ea..1183daff39 100644
--- a/Applications/FontEditor/main.cpp
+++ b/Applications/FontEditor/main.cpp
@@ -31,6 +31,7 @@
 #include <LibGUI/MenuBar.h>
 #include <LibGUI/Window.h>
 #include <LibGfx/Bitmap.h>
+#include <LibGfx/Font.h>
 #include <stdio.h>
 
 int main(int argc, char** argv)
diff --git a/Applications/HexEditor/HexEditor.h b/Applications/HexEditor/HexEditor.h
index 9e1ce1f713..25469cfc0a 100644
--- a/Applications/HexEditor/HexEditor.h
+++ b/Applications/HexEditor/HexEditor.h
@@ -33,6 +33,7 @@
 #include <AK/NonnullRefPtrVector.h>
 #include <AK/StdLibExtras.h>
 #include <LibGUI/ScrollableWidget.h>
+#include <LibGfx/Font.h>
 #include <LibGfx/TextAlignment.h>
 
 class HexEditor : public GUI::ScrollableWidget {
diff --git a/Applications/PaintBrush/PaletteWidget.cpp b/Applications/PaintBrush/PaletteWidget.cpp
index a2c6b78f56..a178bc2041 100644
--- a/Applications/PaintBrush/PaletteWidget.cpp
+++ b/Applications/PaintBrush/PaletteWidget.cpp
@@ -28,6 +28,7 @@
 #include "PaintableWidget.h"
 #include <LibGUI/BoxLayout.h>
 #include <LibGUI/ColorPicker.h>
+#include <LibGfx/Palette.h>
 
 class ColorWidget : public GUI::Frame {
     C_OBJECT(ColorWidget)
diff --git a/Applications/SystemMonitor/GraphWidget.cpp b/Applications/SystemMonitor/GraphWidget.cpp
index 235eff37f6..9023b55768 100644
--- a/Applications/SystemMonitor/GraphWidget.cpp
+++ b/Applications/SystemMonitor/GraphWidget.cpp
@@ -26,6 +26,7 @@
 
 #include "GraphWidget.h"
 #include <LibGUI/Painter.h>
+#include <LibGfx/Font.h>
 
 GraphWidget::GraphWidget(GUI::Widget* parent)
     : GUI::Frame(parent)
diff --git a/Applications/SystemMonitor/MemoryStatsWidget.cpp b/Applications/SystemMonitor/MemoryStatsWidget.cpp
index 8731232dee..fae50431bb 100644
--- a/Applications/SystemMonitor/MemoryStatsWidget.cpp
+++ b/Applications/SystemMonitor/MemoryStatsWidget.cpp
@@ -28,10 +28,11 @@
 #include "GraphWidget.h"
 #include <AK/JsonObject.h>
 #include <LibCore/File.h>
-#include <LibGfx/StylePainter.h>
 #include <LibGUI/BoxLayout.h>
 #include <LibGUI/Label.h>
 #include <LibGUI/Painter.h>
+#include <LibGfx/Font.h>
+#include <LibGfx/StylePainter.h>
 #include <stdio.h>
 #include <stdlib.h>
 
diff --git a/Applications/Terminal/main.cpp b/Applications/Terminal/main.cpp
index 071dbce8e5..9e7d7bfcd0 100644
--- a/Applications/Terminal/main.cpp
+++ b/Applications/Terminal/main.cpp
@@ -39,6 +39,7 @@
 #include <LibGUI/Slider.h>
 #include <LibGUI/Widget.h>
 #include <LibGUI/Window.h>
+#include <LibGfx/Font.h>
 #include <LibVT/TerminalWidget.h>
 #include <assert.h>
 #include <errno.h>
diff --git a/Applications/Welcome/TextWidget.cpp b/Applications/Welcome/TextWidget.cpp
index f631be2989..070801f4c6 100644
--- a/Applications/Welcome/TextWidget.cpp
+++ b/Applications/Welcome/TextWidget.cpp
@@ -28,8 +28,9 @@
 #include <AK/String.h>
 #include <AK/StringBuilder.h>
 #include <AK/Vector.h>
-#include <LibGfx/Palette.h>
 #include <LibGUI/Painter.h>
+#include <LibGfx/Font.h>
+#include <LibGfx/Palette.h>
 
 TextWidget::TextWidget(GUI::Widget* parent)
     : GUI::Frame(parent)
diff --git a/Applications/Welcome/main.cpp b/Applications/Welcome/main.cpp
index 59fd06c060..3af84bdc2f 100644
--- a/Applications/Welcome/main.cpp
+++ b/Applications/Welcome/main.cpp
@@ -33,6 +33,7 @@
 #include <LibGUI/Label.h>
 #include <LibGUI/StackWidget.h>
 #include <LibGUI/Window.h>
+#include <LibGfx/Font.h>
 #include <LibGfx/PNGLoader.h>
 
 #include "TextWidget.h"
diff --git a/DevTools/HackStudio/CursorTool.cpp b/DevTools/HackStudio/CursorTool.cpp
index f4ac8ff468..63ee928399 100644
--- a/DevTools/HackStudio/CursorTool.cpp
+++ b/DevTools/HackStudio/CursorTool.cpp
@@ -29,6 +29,7 @@
 #include "FormWidget.h"
 #include "WidgetTreeModel.h"
 #include <AK/LogStream.h>
+#include <LibGfx/Palette.h>
 
 void CursorTool::on_mousedown(GUI::MouseEvent& event)
 {
diff --git a/DevTools/HackStudio/ProcessStateWidget.cpp b/DevTools/HackStudio/ProcessStateWidget.cpp
index 4ad6e20882..e724a66fb2 100644
--- a/DevTools/HackStudio/ProcessStateWidget.cpp
+++ b/DevTools/HackStudio/ProcessStateWidget.cpp
@@ -29,6 +29,7 @@
 #include <LibCore/Timer.h>
 #include <LibGUI/BoxLayout.h>
 #include <LibGUI/Label.h>
+#include <LibGfx/Font.h>
 #include <unistd.h>
 
 ProcessStateWidget::ProcessStateWidget(GUI::Widget* parent)
diff --git a/Games/Snake/SnakeGame.cpp b/Games/Snake/SnakeGame.cpp
index 8cebca5c26..a560d895d6 100644
--- a/Games/Snake/SnakeGame.cpp
+++ b/Games/Snake/SnakeGame.cpp
@@ -28,6 +28,7 @@
 #include <LibGUI/FontDatabase.h>
 #include <LibGUI/Painter.h>
 #include <LibGfx/Bitmap.h>
+#include <LibGfx/Font.h>
 #include <stdlib.h>
 #include <time.h>
 
diff --git a/Libraries/LibGUI/AboutDialog.cpp b/Libraries/LibGUI/AboutDialog.cpp
index 1e7418e01f..2a6982ffe5 100644
--- a/Libraries/LibGUI/AboutDialog.cpp
+++ b/Libraries/LibGUI/AboutDialog.cpp
@@ -29,6 +29,7 @@
 #include <LibGUI/Button.h>
 #include <LibGUI/Label.h>
 #include <LibGUI/Widget.h>
+#include <LibGfx/Font.h>
 
 namespace GUI {
 
diff --git a/Libraries/LibGUI/AbstractTableView.h b/Libraries/LibGUI/AbstractTableView.h
index 2ec222ca01..6dea47aeac 100644
--- a/Libraries/LibGUI/AbstractTableView.h
+++ b/Libraries/LibGUI/AbstractTableView.h
@@ -37,7 +37,7 @@ class TableCellPaintingDelegate {
 public:
     virtual ~TableCellPaintingDelegate() {}
 
-    virtual void paint(Painter&, const Gfx::Rect&, const Palette&, const Model&, const ModelIndex&) = 0;
+    virtual void paint(Painter&, const Gfx::Rect&, const Gfx::Palette&, const Model&, const ModelIndex&) = 0;
 };
 
 class AbstractTableView : public AbstractView {
diff --git a/Libraries/LibGUI/Application.cpp b/Libraries/LibGUI/Application.cpp
index 88b88e1ed5..7a0b1401c7 100644
--- a/Libraries/LibGUI/Application.cpp
+++ b/Libraries/LibGUI/Application.cpp
@@ -24,7 +24,6 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <LibGfx/Palette.h>
 #include <LibGUI/Action.h>
 #include <LibGUI/Application.h>
 #include <LibGUI/Desktop.h>
@@ -33,6 +32,8 @@
 #include <LibGUI/Painter.h>
 #include <LibGUI/Window.h>
 #include <LibGUI/WindowServerConnection.h>
+#include <LibGfx/Font.h>
+#include <LibGfx/Palette.h>
 
 namespace GUI {
 
diff --git a/Libraries/LibGUI/Button.cpp b/Libraries/LibGUI/Button.cpp
index 30fdde5955..5ec77339c7 100644
--- a/Libraries/LibGUI/Button.cpp
+++ b/Libraries/LibGUI/Button.cpp
@@ -26,11 +26,13 @@
 
 #include <AK/StringBuilder.h>
 #include <Kernel/KeyCode.h>
-#include <LibGfx/StylePainter.h>
 #include <LibGUI/Action.h>
 #include <LibGUI/ActionGroup.h>
 #include <LibGUI/Button.h>
 #include <LibGUI/Painter.h>
+#include <LibGfx/Font.h>
+#include <LibGfx/Palette.h>
+#include <LibGfx/StylePainter.h>
 
 namespace GUI {
 
diff --git a/Libraries/LibGUI/CheckBox.cpp b/Libraries/LibGUI/CheckBox.cpp
index 8b5ca9c060..34e87ac7d9 100644
--- a/Libraries/LibGUI/CheckBox.cpp
+++ b/Libraries/LibGUI/CheckBox.cpp
@@ -25,11 +25,12 @@
  */
 
 #include <Kernel/KeyCode.h>
-#include <LibGfx/CharacterBitmap.h>
-#include <LibGfx/Palette.h>
-#include <LibGfx/StylePainter.h>
 #include <LibGUI/CheckBox.h>
 #include <LibGUI/Painter.h>
+#include <LibGfx/CharacterBitmap.h>
+#include <LibGfx/Font.h>
+#include <LibGfx/Palette.h>
+#include <LibGfx/StylePainter.h>
 
 namespace GUI {
 
diff --git a/Libraries/LibGUI/ColorPicker.cpp b/Libraries/LibGUI/ColorPicker.cpp
index 461ad5d0fa..4e3e7906b1 100644
--- a/Libraries/LibGUI/ColorPicker.cpp
+++ b/Libraries/LibGUI/ColorPicker.cpp
@@ -30,6 +30,7 @@
 #include <LibGUI/Frame.h>
 #include <LibGUI/SpinBox.h>
 #include <LibGUI/Widget.h>
+#include <LibGfx/Palette.h>
 
 namespace GUI {
 
diff --git a/Libraries/LibGUI/ColumnsView.cpp b/Libraries/LibGUI/ColumnsView.cpp
index 068ea0b73e..85c30a575a 100644
--- a/Libraries/LibGUI/ColumnsView.cpp
+++ b/Libraries/LibGUI/ColumnsView.cpp
@@ -24,10 +24,11 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <LibGfx/CharacterBitmap.h>
 #include <LibGUI/ColumnsView.h>
 #include <LibGUI/Painter.h>
 #include <LibGUI/ScrollBar.h>
+#include <LibGfx/CharacterBitmap.h>
+#include <LibGfx/Palette.h>
 
 namespace GUI {
 
diff --git a/Libraries/LibGUI/Frame.cpp b/Libraries/LibGUI/Frame.cpp
index 6c9dfdc7a9..6025e72698 100644
--- a/Libraries/LibGUI/Frame.cpp
+++ b/Libraries/LibGUI/Frame.cpp
@@ -24,9 +24,10 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <LibGfx/StylePainter.h>
 #include <LibGUI/Frame.h>
 #include <LibGUI/Painter.h>
+#include <LibGfx/Palette.h>
+#include <LibGfx/StylePainter.h>
 
 namespace GUI {
 
diff --git a/Libraries/LibGUI/GroupBox.cpp b/Libraries/LibGUI/GroupBox.cpp
index 9f1263d8df..db9cb6480d 100644
--- a/Libraries/LibGUI/GroupBox.cpp
+++ b/Libraries/LibGUI/GroupBox.cpp
@@ -24,10 +24,11 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <LibGfx/Palette.h>
-#include <LibGfx/StylePainter.h>
 #include <LibGUI/GroupBox.h>
 #include <LibGUI/Painter.h>
+#include <LibGfx/Font.h>
+#include <LibGfx/Palette.h>
+#include <LibGfx/StylePainter.h>
 
 namespace GUI {
 
diff --git a/Libraries/LibGUI/Label.cpp b/Libraries/LibGUI/Label.cpp
index 14f272cb94..944d66084e 100644
--- a/Libraries/LibGUI/Label.cpp
+++ b/Libraries/LibGUI/Label.cpp
@@ -24,10 +24,11 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <LibGfx/Bitmap.h>
-#include <LibGfx/Palette.h>
 #include <LibGUI/Label.h>
 #include <LibGUI/Painter.h>
+#include <LibGfx/Bitmap.h>
+#include <LibGfx/Font.h>
+#include <LibGfx/Palette.h>
 
 namespace GUI {
 
diff --git a/Libraries/LibGUI/MessageBox.cpp b/Libraries/LibGUI/MessageBox.cpp
index 24bde0c882..c910b3a386 100644
--- a/Libraries/LibGUI/MessageBox.cpp
+++ b/Libraries/LibGUI/MessageBox.cpp
@@ -28,6 +28,7 @@
 #include <LibGUI/Button.h>
 #include <LibGUI/Label.h>
 #include <LibGUI/MessageBox.h>
+#include <LibGfx/Font.h>
 #include <stdio.h>
 
 namespace GUI {
diff --git a/Libraries/LibGUI/ProgressBar.cpp b/Libraries/LibGUI/ProgressBar.cpp
index b957a159c1..92dfc06f04 100644
--- a/Libraries/LibGUI/ProgressBar.cpp
+++ b/Libraries/LibGUI/ProgressBar.cpp
@@ -28,6 +28,7 @@
 #include <AK/StringBuilder.h>
 #include <LibGUI/Painter.h>
 #include <LibGUI/ProgressBar.h>
+#include <LibGfx/Palette.h>
 
 namespace GUI {
 
diff --git a/Libraries/LibGUI/RadioButton.cpp b/Libraries/LibGUI/RadioButton.cpp
index 51b12b9d3d..e633a909b5 100644
--- a/Libraries/LibGUI/RadioButton.cpp
+++ b/Libraries/LibGUI/RadioButton.cpp
@@ -24,10 +24,12 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <LibGfx/Bitmap.h>
-#include <LibGfx/StylePainter.h>
 #include <LibGUI/Painter.h>
 #include <LibGUI/RadioButton.h>
+#include <LibGfx/Bitmap.h>
+#include <LibGfx/Font.h>
+#include <LibGfx/Palette.h>
+#include <LibGfx/StylePainter.h>
 
 namespace GUI {
 
diff --git a/Libraries/LibGUI/Slider.cpp b/Libraries/LibGUI/Slider.cpp
index 2e3677b64f..bb4eb142e7 100644
--- a/Libraries/LibGUI/Slider.cpp
+++ b/Libraries/LibGUI/Slider.cpp
@@ -28,6 +28,7 @@
 #include <AK/StdLibExtras.h>
 #include <LibGUI/Painter.h>
 #include <LibGUI/Slider.h>
+#include <LibGfx/Palette.h>
 #include <LibGfx/StylePainter.h>
 
 namespace GUI {
diff --git a/Libraries/LibGUI/StatusBar.cpp b/Libraries/LibGUI/StatusBar.cpp
index 7e0699a4d9..8f9d41820a 100644
--- a/Libraries/LibGUI/StatusBar.cpp
+++ b/Libraries/LibGUI/StatusBar.cpp
@@ -24,12 +24,13 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <LibGfx/StylePainter.h>
 #include <LibGUI/BoxLayout.h>
 #include <LibGUI/Label.h>
 #include <LibGUI/Painter.h>
 #include <LibGUI/ResizeCorner.h>
 #include <LibGUI/StatusBar.h>
+#include <LibGfx/Palette.h>
+#include <LibGfx/StylePainter.h>
 
 namespace GUI {
 
diff --git a/Libraries/LibGUI/TabWidget.cpp b/Libraries/LibGUI/TabWidget.cpp
index f389f6fa3a..e1ee40cbce 100644
--- a/Libraries/LibGUI/TabWidget.cpp
+++ b/Libraries/LibGUI/TabWidget.cpp
@@ -24,11 +24,12 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <LibGfx/Palette.h>
-#include <LibGfx/StylePainter.h>
 #include <LibGUI/BoxLayout.h>
 #include <LibGUI/Painter.h>
 #include <LibGUI/TabWidget.h>
+#include <LibGfx/Font.h>
+#include <LibGfx/Palette.h>
+#include <LibGfx/StylePainter.h>
 
 namespace GUI {
 
diff --git a/Libraries/LibGUI/Widget.cpp b/Libraries/LibGUI/Widget.cpp
index 0997b52773..a363a730ba 100644
--- a/Libraries/LibGUI/Widget.cpp
+++ b/Libraries/LibGUI/Widget.cpp
@@ -94,6 +94,8 @@ const WidgetClassRegistration* WidgetClassRegistration::find(const String& class
 
 Widget::Widget(Widget* parent)
     : Core::Object(parent, true)
+    , m_background_role(Gfx::ColorRole::Window)
+    , m_foreground_role(Gfx::ColorRole::WindowText)
     , m_font(Gfx::Font::default_font())
     , m_palette(Application::the().palette().impl())
 {
@@ -731,4 +733,19 @@ void Widget::set_palette(const Palette& palette)
     m_palette = palette.impl();
 }
 
+void Widget::set_background_role(ColorRole role)
+{
+    m_background_role = role;
+}
+
+void Widget::set_foreground_role(ColorRole role)
+{
+    m_foreground_role = role;
+}
+
+Gfx::Palette Widget::palette() const
+{
+    return Gfx::Palette(*m_palette);
+}
+
 }
diff --git a/Libraries/LibGUI/Widget.h b/Libraries/LibGUI/Widget.h
index d294673dca..35b2c1121f 100644
--- a/Libraries/LibGUI/Widget.h
+++ b/Libraries/LibGUI/Widget.h
@@ -31,14 +31,12 @@
 #include <AK/String.h>
 #include <LibCore/ElapsedTimer.h>
 #include <LibCore/Object.h>
-#include <LibGfx/Color.h>
-#include <LibGfx/Font.h>
-#include <LibGfx/Orientation.h>
-#include <LibGfx/Palette.h>
-#include <LibGfx/Rect.h>
-#include <LibGfx/SystemTheme.h>
 #include <LibGUI/Event.h>
 #include <LibGUI/Shortcut.h>
+#include <LibGfx/Color.h>
+#include <LibGfx/Forward.h>
+#include <LibGfx/Orientation.h>
+#include <LibGfx/Rect.h>
 
 #define REGISTER_GWIDGET(class_name)                          \
     extern WidgetClassRegistration registration_##class_name; \
@@ -191,11 +189,11 @@ public:
     void move_by(int x, int y) { move_by({ x, y }); }
     void move_by(const Gfx::Point& delta) { set_relative_rect({ relative_position().translated(delta), size() }); }
 
-    ColorRole background_role() const { return m_background_role; }
-    void set_background_role(ColorRole role) { m_background_role = role; }
+    Gfx::ColorRole background_role() const { return m_background_role; }
+    void set_background_role(Gfx::ColorRole);
 
-    ColorRole foreground_role() const { return m_foreground_role; }
-    void set_foreground_role(ColorRole role) { m_foreground_role = role; }
+    Gfx::ColorRole foreground_role() const { return m_foreground_role; }
+    void set_foreground_role(Gfx::ColorRole);
 
     Color background_color() const { return m_background_color; }
     Color foreground_color() const { return m_foreground_color; }
@@ -275,8 +273,8 @@ public:
 
     void do_layout();
 
-    Palette palette() const { return Palette(*m_palette); }
-    void set_palette(const Palette&);
+    Gfx::Palette palette() const;
+    void set_palette(const Gfx::Palette&);
 
 protected:
     explicit Widget(Widget* parent = nullptr);
@@ -321,8 +319,8 @@ private:
     OwnPtr<Layout> m_layout;
 
     Gfx::Rect m_relative_rect;
-    ColorRole m_background_role { ColorRole::Window };
-    ColorRole m_foreground_role { ColorRole::WindowText };
+    Gfx::ColorRole m_background_role;
+    Gfx::ColorRole m_foreground_role;
     Color m_background_color;
     Color m_foreground_color;
     NonnullRefPtr<Gfx::Font> m_font;
diff --git a/Libraries/LibGfx/Forward.h b/Libraries/LibGfx/Forward.h
index 0ecd623a5a..325ec0c357 100644
--- a/Libraries/LibGfx/Forward.h
+++ b/Libraries/LibGfx/Forward.h
@@ -41,6 +41,7 @@ class GlyphBitmap;
 class ImageDecoder;
 class Painter;
 class Palette;
+class PaletteImpl;
 class Point;
 class Rect;
 class Size;
@@ -49,6 +50,7 @@ class SystemTheme;
 class Triangle;
 
 enum class BitmapFormat;
+enum class ColorRole;
 
 }
 
diff --git a/MenuApplets/Audio/main.cpp b/MenuApplets/Audio/main.cpp
index a2d310914e..15b93d8a09 100644
--- a/MenuApplets/Audio/main.cpp
+++ b/MenuApplets/Audio/main.cpp
@@ -30,6 +30,7 @@
 #include <LibGUI/Widget.h>
 #include <LibGUI/Window.h>
 #include <LibGfx/Bitmap.h>
+#include <LibGfx/Font.h>
 
 class AudioWidget final : public GUI::Widget {
     C_OBJECT(AudioWidget)
diff --git a/MenuApplets/Clock/main.cpp b/MenuApplets/Clock/main.cpp
index d7a1c24f0b..1cb22e85db 100644
--- a/MenuApplets/Clock/main.cpp
+++ b/MenuApplets/Clock/main.cpp
@@ -29,6 +29,7 @@
 #include <LibGUI/Painter.h>
 #include <LibGUI/Widget.h>
 #include <LibGUI/Window.h>
+#include <LibGfx/Font.h>
 #include <LibGfx/Palette.h>
 #include <stdio.h>
 #include <time.h>
diff --git a/MenuApplets/UserName/main.cpp b/MenuApplets/UserName/main.cpp
index 8b5f409082..8ffc122566 100644
--- a/MenuApplets/UserName/main.cpp
+++ b/MenuApplets/UserName/main.cpp
@@ -28,6 +28,7 @@
 #include <LibGUI/Painter.h>
 #include <LibGUI/Widget.h>
 #include <LibGUI/Window.h>
+#include <LibGfx/Font.h>
 #include <LibGfx/Palette.h>
 #include <stdio.h>