LibGUI: Remove leading G from filenames

Author: https://github.com/awesomekling
Commit: https://github.com/SerenityOS/serenity/commit/6a9cc66b976

Applications/About/main.cpp

@@ -24,12 +24,12 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <LibGUI/GApplication.h>
-#include <LibGUI/GBoxLayout.h>
-#include <LibGUI/GButton.h>
-#include <LibGUI/GDesktop.h>
-#include <LibGUI/GLabel.h>
-#include <LibGUI/GWindow.h>
+#include <LibGUI/Application.h>
+#include <LibGUI/BoxLayout.h>
+#include <LibGUI/Button.h>
+#include <LibGUI/Desktop.h>
+#include <LibGUI/Label.h>
+#include <LibGUI/Window.h>
 #include <sys/utsname.h>
 #include <stdio.h>
 

Applications/Browser/InspectorWidget.cpp

@@ -25,11 +25,11 @@
  */
 
 #include "InspectorWidget.h"
-#include <LibGUI/GBoxLayout.h>
-#include <LibGUI/GSplitter.h>
-#include <LibGUI/GTableView.h>
-#include <LibGUI/GTreeView.h>
-#include <LibGUI/GTabWidget.h>
+#include <LibGUI/BoxLayout.h>
+#include <LibGUI/Splitter.h>
+#include <LibGUI/TableView.h>
+#include <LibGUI/TreeView.h>
+#include <LibGUI/TabWidget.h>
 #include <LibHTML/DOM/Document.h>
 #include <LibHTML/DOM/Element.h>
 #include <LibHTML/DOMTreeModel.h>

Applications/Browser/InspectorWidget.h

@@ -24,7 +24,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <LibGUI/GWidget.h>
+#include <LibGUI/Widget.h>
 
 class Document;
 

Applications/Browser/main.cpp

@@ -27,16 +27,16 @@
 #include "History.h"
 #include "InspectorWidget.h"
 #include <LibCore/File.h>
-#include <LibGUI/GAboutDialog.h>
-#include <LibGUI/GAction.h>
-#include <LibGUI/GApplication.h>
-#include <LibGUI/GBoxLayout.h>
-#include <LibGUI/GMenu.h>
-#include <LibGUI/GMenuBar.h>
-#include <LibGUI/GStatusBar.h>
-#include <LibGUI/GTextBox.h>
-#include <LibGUI/GToolBar.h>
-#include <LibGUI/GWindow.h>
+#include <LibGUI/AboutDialog.h>
+#include <LibGUI/Action.h>
+#include <LibGUI/Application.h>
+#include <LibGUI/BoxLayout.h>
+#include <LibGUI/Menu.h>
+#include <LibGUI/MenuBar.h>
+#include <LibGUI/StatusBar.h>
+#include <LibGUI/TextBox.h>
+#include <LibGUI/ToolBar.h>
+#include <LibGUI/Window.h>
 #include <LibHTML/CSS/StyleResolver.h>
 #include <LibHTML/DOM/Element.h>
 #include <LibHTML/DOMTreeModel.h>

Applications/Calculator/CalculatorWidget.cpp

@@ -26,9 +26,9 @@
 
 #include "CalculatorWidget.h"
 #include <AK/Assertions.h>
-#include <LibGUI/GButton.h>
-#include <LibGUI/GLabel.h>
-#include <LibGUI/GTextBox.h>
+#include <LibGUI/Button.h>
+#include <LibGUI/Label.h>
+#include <LibGUI/TextBox.h>
 
 CalculatorWidget::CalculatorWidget(GUI::Widget* parent)
     : GUI::Widget(parent)

Applications/Calculator/CalculatorWidget.h

@@ -29,7 +29,7 @@
 #include "Calculator.h"
 #include "Keypad.h"
 #include <AK/Vector.h>
-#include <LibGUI/GWidget.h>
+#include <LibGUI/Widget.h>
 
 namespace GUI {
 class Button;

Applications/Calculator/main.cpp

@@ -25,11 +25,11 @@
  */
 
 #include "CalculatorWidget.h"
-#include <LibGUI/GAboutDialog.h>
-#include <LibGUI/GAction.h>
-#include <LibGUI/GApplication.h>
-#include <LibGUI/GMenuBar.h>
-#include <LibGUI/GWindow.h>
+#include <LibGUI/AboutDialog.h>
+#include <LibGUI/Action.h>
+#include <LibGUI/Application.h>
+#include <LibGUI/MenuBar.h>
+#include <LibGUI/Window.h>
 #include <stdio.h>
 
 int main(int argc, char** argv)

Applications/ChanViewer/BoardListModel.h

@@ -28,7 +28,7 @@
 
 #include <AK/JsonArray.h>
 #include <LibCore/HttpJob.h>
-#include <LibGUI/GModel.h>
+#include <LibGUI/Model.h>
 
 class BoardListModel final : public GUI::Model {
 public:

Applications/ChanViewer/ThreadCatalogModel.h

@@ -28,7 +28,7 @@
 
 #include <AK/JsonArray.h>
 #include <LibCore/HttpJob.h>
-#include <LibGUI/GModel.h>
+#include <LibGUI/Model.h>
 
 class ThreadCatalogModel final : public GUI::Model {
 public:

Applications/ChanViewer/main.cpp

@@ -26,15 +26,15 @@
 
 #include "BoardListModel.h"
 #include "ThreadCatalogModel.h"
-#include <LibGUI/GAboutDialog.h>
-#include <LibGUI/GAction.h>
-#include <LibGUI/GApplication.h>
-#include <LibGUI/GBoxLayout.h>
-#include <LibGUI/GComboBox.h>
-#include <LibGUI/GMenuBar.h>
-#include <LibGUI/GStatusBar.h>
-#include <LibGUI/GTableView.h>
-#include <LibGUI/GWindow.h>
+#include <LibGUI/AboutDialog.h>
+#include <LibGUI/Action.h>
+#include <LibGUI/Application.h>
+#include <LibGUI/BoxLayout.h>
+#include <LibGUI/ComboBox.h>
+#include <LibGUI/MenuBar.h>
+#include <LibGUI/StatusBar.h>
+#include <LibGUI/TableView.h>
+#include <LibGUI/Window.h>
 #include <stdio.h>
 
 int main(int argc, char** argv)

Applications/DisplayProperties/DisplayProperties.cpp

@@ -28,22 +28,22 @@
 #include "ItemListModel.h"
 #include <AK/StringBuilder.h>
 #include <LibCore/DirIterator.h>
-#include <LibGUI/GAction.h>
-#include <LibGUI/GApplication.h>
-#include <LibGUI/GBoxLayout.h>
-#include <LibGUI/GButton.h>
-#include <LibGUI/GDesktop.h>
-#include <LibGUI/GFileSystemModel.h>
-#include <LibGUI/GGroupBox.h>
-#include <LibGUI/GLabel.h>
-#include <LibGUI/GListView.h>
-#include <LibGUI/GScrollBar.h>
-#include <LibGUI/GSplitter.h>
-#include <LibGUI/GTabWidget.h>
-#include <LibGUI/GToolBar.h>
-#include <LibGUI/GWidget.h>
-#include <LibGUI/GWindow.h>
-#include <LibGUI/GWindowServerConnection.h>
+#include <LibGUI/Action.h>
+#include <LibGUI/Application.h>
+#include <LibGUI/BoxLayout.h>
+#include <LibGUI/Button.h>
+#include <LibGUI/Desktop.h>
+#include <LibGUI/FileSystemModel.h>
+#include <LibGUI/GroupBox.h>
+#include <LibGUI/Label.h>
+#include <LibGUI/ListView.h>
+#include <LibGUI/ScrollBar.h>
+#include <LibGUI/Splitter.h>
+#include <LibGUI/TabWidget.h>
+#include <LibGUI/ToolBar.h>
+#include <LibGUI/Widget.h>
+#include <LibGUI/Window.h>
+#include <LibGUI/WindowServerConnection.h>
 #include <Servers/WindowServer/WindowManager.h>
 
 DisplayPropertiesWidget::DisplayPropertiesWidget()

Applications/DisplayProperties/DisplayProperties.h

@@ -32,8 +32,8 @@
 #include <LibCore/ConfigFile.h>
 #include <LibGfx/Color.h>
 #include <LibGfx/Size.h>
-#include <LibGUI/GWidget.h>
-#include <LibGUI/GLabel.h>
+#include <LibGUI/Widget.h>
+#include <LibGUI/Label.h>
 
 class DisplayPropertiesWidget final {
 public:

Applications/DisplayProperties/ItemListModel.h

@@ -28,7 +28,7 @@
 
 #include <AK/NonnullRefPtr.h>
 #include <AK/Vector.h>
-#include <LibGUI/GModel.h>
+#include <LibGUI/Model.h>
 
 template<typename T>
 class ItemListModel final : public GUI::Model {

Applications/DisplayProperties/main.cpp

@@ -25,14 +25,14 @@
  */
 
 #include "DisplayProperties.h"
-#include <LibGUI/GAboutDialog.h>
-#include <LibGUI/GAction.h>
-#include <LibGUI/GApplication.h>
-#include <LibGUI/GBoxLayout.h>
-#include <LibGUI/GMenu.h>
-#include <LibGUI/GMenuBar.h>
-#include <LibGUI/GWidget.h>
-#include <LibGUI/GWindow.h>
+#include <LibGUI/AboutDialog.h>
+#include <LibGUI/Action.h>
+#include <LibGUI/Application.h>
+#include <LibGUI/BoxLayout.h>
+#include <LibGUI/Menu.h>
+#include <LibGUI/MenuBar.h>
+#include <LibGUI/Widget.h>
+#include <LibGUI/Window.h>
 #include <stdio.h>
 
 int main(int argc, char** argv)

Applications/FileManager/DirectoryView.cpp

@@ -27,7 +27,7 @@
 #include "DirectoryView.h"
 #include <AK/FileSystemPath.h>
 #include <AK/StringBuilder.h>
-#include <LibGUI/GSortingProxyModel.h>
+#include <LibGUI/SortingProxyModel.h>
 #include <stdio.h>
 #include <unistd.h>
 

Applications/FileManager/DirectoryView.h

@@ -27,11 +27,11 @@
 #pragma once
 
 #include <AK/Vector.h>
-#include <LibGUI/GColumnsView.h>
-#include <LibGUI/GFileSystemModel.h>
-#include <LibGUI/GItemView.h>
-#include <LibGUI/GStackWidget.h>
-#include <LibGUI/GTableView.h>
+#include <LibGUI/ColumnsView.h>
+#include <LibGUI/FileSystemModel.h>
+#include <LibGUI/ItemView.h>
+#include <LibGUI/StackWidget.h>
+#include <LibGUI/TableView.h>
 #include <sys/stat.h>
 
 class DirectoryView final : public GUI::StackWidget {

Applications/FileManager/PropertiesDialog.cpp

@@ -26,11 +26,11 @@
 
 #include "PropertiesDialog.h"
 #include <AK/StringBuilder.h>
-#include <LibGUI/GBoxLayout.h>
-#include <LibGUI/GCheckBox.h>
-#include <LibGUI/GFilePicker.h>
-#include <LibGUI/GMessageBox.h>
-#include <LibGUI/GTabWidget.h>
+#include <LibGUI/BoxLayout.h>
+#include <LibGUI/CheckBox.h>
+#include <LibGUI/FilePicker.h>
+#include <LibGUI/MessageBox.h>
+#include <LibGUI/TabWidget.h>
 #include <limits.h>
 #include <pwd.h>
 #include <stdio.h>

Applications/FileManager/PropertiesDialog.h

@@ -28,11 +28,11 @@
 
 #include <AK/FileSystemPath.h>
 #include <LibCore/File.h>
-#include <LibGUI/GButton.h>
-#include <LibGUI/GDialog.h>
-#include <LibGUI/GFileSystemModel.h>
-#include <LibGUI/GLabel.h>
-#include <LibGUI/GTextBox.h>
+#include <LibGUI/Button.h>
+#include <LibGUI/Dialog.h>
+#include <LibGUI/FileSystemModel.h>
+#include <LibGUI/Label.h>
+#include <LibGUI/TextBox.h>
 
 class PropertiesDialog final : public GUI::Dialog {
     C_OBJECT(PropertiesDialog)

Applications/FileManager/main.cpp

@@ -31,25 +31,25 @@
 #include <AK/StringBuilder.h>
 #include <LibCore/ConfigFile.h>
 #include <LibCore/UserInfo.h>
-#include <LibGUI/GAboutDialog.h>
-#include <LibGUI/GAction.h>
-#include <LibGUI/GActionGroup.h>
-#include <LibGUI/GApplication.h>
-#include <LibGUI/GBoxLayout.h>
-#include <LibGUI/GClipboard.h>
-#include <LibGUI/GFileSystemModel.h>
-#include <LibGUI/GInputBox.h>
-#include <LibGUI/GLabel.h>
-#include <LibGUI/GMenuBar.h>
-#include <LibGUI/GMessageBox.h>
-#include <LibGUI/GProgressBar.h>
-#include <LibGUI/GSplitter.h>
-#include <LibGUI/GStatusBar.h>
-#include <LibGUI/GTextEditor.h>
-#include <LibGUI/GToolBar.h>
-#include <LibGUI/GTreeView.h>
-#include <LibGUI/GWidget.h>
-#include <LibGUI/GWindow.h>
+#include <LibGUI/AboutDialog.h>
+#include <LibGUI/Action.h>
+#include <LibGUI/ActionGroup.h>
+#include <LibGUI/Application.h>
+#include <LibGUI/BoxLayout.h>
+#include <LibGUI/Clipboard.h>
+#include <LibGUI/FileSystemModel.h>
+#include <LibGUI/InputBox.h>
+#include <LibGUI/Label.h>
+#include <LibGUI/MenuBar.h>
+#include <LibGUI/MessageBox.h>
+#include <LibGUI/ProgressBar.h>
+#include <LibGUI/Splitter.h>
+#include <LibGUI/StatusBar.h>
+#include <LibGUI/TextEditor.h>
+#include <LibGUI/ToolBar.h>
+#include <LibGUI/TreeView.h>
+#include <LibGUI/Widget.h>
+#include <LibGUI/Window.h>
 #include <signal.h>
 #include <stdio.h>
 #include <unistd.h>

Applications/FontEditor/FontEditor.cpp

@@ -29,13 +29,13 @@
 #include "GlyphMapWidget.h"
 #include "UI_FontEditorBottom.h"
 #include <AK/StringBuilder.h>
-#include <LibGUI/GButton.h>
-#include <LibGUI/GCheckBox.h>
-#include <LibGUI/GGroupBox.h>
-#include <LibGUI/GLabel.h>
-#include <LibGUI/GPainter.h>
-#include <LibGUI/GSpinBox.h>
-#include <LibGUI/GTextBox.h>
+#include <LibGUI/Button.h>
+#include <LibGUI/CheckBox.h>
+#include <LibGUI/GroupBox.h>
+#include <LibGUI/Label.h>
+#include <LibGUI/Painter.h>
+#include <LibGUI/SpinBox.h>
+#include <LibGUI/TextBox.h>
 #include <stdlib.h>
 
 FontEditorWidget::FontEditorWidget(const String& path, RefPtr<Gfx::Font>&& edited_font, GUI::Widget* parent)

Applications/FontEditor/FontEditor.h

@@ -27,7 +27,7 @@
 #pragma once
 
 #include <AK/Function.h>
-#include <LibGUI/GWidget.h>
+#include <LibGUI/Widget.h>
 
 class GlyphEditorWidget;
 class GlyphMapWidget;

Applications/FontEditor/GlyphEditorWidget.cpp

@@ -25,7 +25,7 @@
  */
 
 #include "GlyphEditorWidget.h"
-#include <LibGUI/GPainter.h>
+#include <LibGUI/Painter.h>
 
 GlyphEditorWidget::GlyphEditorWidget(Gfx::Font& mutable_font, GUI::Widget* parent)
     : GUI::Frame(parent)

Applications/FontEditor/GlyphEditorWidget.h

@@ -25,7 +25,7 @@
  */
 
 #include <AK/Function.h>
-#include <LibGUI/GFrame.h>
+#include <LibGUI/Frame.h>
 
 class GlyphEditorWidget final : public GUI::Frame {
     C_OBJECT(GlyphEditorWidget)

Applications/FontEditor/GlyphMapWidget.cpp

@@ -26,7 +26,7 @@
 
 #include "GlyphMapWidget.h"
 #include <LibGfx/Palette.h>
-#include <LibGUI/GPainter.h>
+#include <LibGUI/Painter.h>
 
 GlyphMapWidget::GlyphMapWidget(Gfx::Font& mutable_font, GUI::Widget* parent)
     : GUI::Frame(parent)

Applications/FontEditor/GlyphMapWidget.h

@@ -27,7 +27,7 @@
 #pragma once
 
 #include <AK/Function.h>
-#include <LibGUI/GFrame.h>
+#include <LibGUI/Frame.h>
 
 class GlyphMapWidget final : public GUI::Frame {
     C_OBJECT(GlyphMapWidget)

Applications/FontEditor/main.cpp

@@ -25,11 +25,11 @@
  */
 
 #include "FontEditor.h"
-#include <LibGUI/GAboutDialog.h>
-#include <LibGUI/GAction.h>
-#include <LibGUI/GApplication.h>
-#include <LibGUI/GMenuBar.h>
-#include <LibGUI/GWindow.h>
+#include <LibGUI/AboutDialog.h>
+#include <LibGUI/Action.h>
+#include <LibGUI/Application.h>
+#include <LibGUI/MenuBar.h>
+#include <LibGUI/Window.h>
 #include <stdio.h>
 
 int main(int argc, char** argv)

Applications/Help/ManualModel.h

@@ -28,7 +28,7 @@
 
 #include <AK/NonnullRefPtr.h>
 #include <AK/String.h>
-#include <LibGUI/GModel.h>
+#include <LibGUI/Model.h>
 
 class ManualModel final : public GUI::Model {
 public:

Applications/Help/main.cpp

@@ -27,18 +27,18 @@
 #include "History.h"
 #include "ManualModel.h"
 #include <LibCore/File.h>
-#include <LibGUI/GAboutDialog.h>
-#include <LibGUI/GAction.h>
-#include <LibGUI/GApplication.h>
-#include <LibGUI/GBoxLayout.h>
-#include <LibGUI/GMenu.h>
-#include <LibGUI/GMenuBar.h>
-#include <LibGUI/GMessageBox.h>
-#include <LibGUI/GSplitter.h>
-#include <LibGUI/GTextEditor.h>
-#include <LibGUI/GToolBar.h>
-#include <LibGUI/GTreeView.h>
-#include <LibGUI/GWindow.h>
+#include <LibGUI/AboutDialog.h>
+#include <LibGUI/Action.h>
+#include <LibGUI/Application.h>
+#include <LibGUI/BoxLayout.h>
+#include <LibGUI/Menu.h>
+#include <LibGUI/MenuBar.h>
+#include <LibGUI/MessageBox.h>
+#include <LibGUI/Splitter.h>
+#include <LibGUI/TextEditor.h>
+#include <LibGUI/ToolBar.h>
+#include <LibGUI/TreeView.h>
+#include <LibGUI/Window.h>
 #include <LibHTML/HtmlView.h>
 #include <LibHTML/Layout/LayoutNode.h>
 #include <LibHTML/Parser/CSSParser.h>

Applications/HexEditor/HexEditor.cpp

@@ -28,14 +28,14 @@
 #include <AK/StringBuilder.h>
 #include <Kernel/KeyCode.h>
 #include <LibGfx/Palette.h>
-#include <LibGUI/GAction.h>
-#include <LibGUI/GClipboard.h>
-#include <LibGUI/GFontDatabase.h>
-#include <LibGUI/GMenu.h>
-#include <LibGUI/GPainter.h>
-#include <LibGUI/GScrollBar.h>
-#include <LibGUI/GTextEditor.h>
-#include <LibGUI/GWindow.h>
+#include <LibGUI/Action.h>
+#include <LibGUI/Clipboard.h>
+#include <LibGUI/FontDatabase.h>
+#include <LibGUI/Menu.h>
+#include <LibGUI/Painter.h>
+#include <LibGUI/ScrollBar.h>
+#include <LibGUI/TextEditor.h>
+#include <LibGUI/Window.h>
 #include <ctype.h>
 #include <fcntl.h>
 #include <stdio.h>

Applications/HexEditor/HexEditor.h

@@ -32,7 +32,7 @@
 #include <AK/NonnullRefPtrVector.h>
 #include <AK/StdLibExtras.h>
 #include <LibGfx/TextAlignment.h>
-#include <LibGUI/GScrollableWidget.h>
+#include <LibGUI/ScrollableWidget.h>
 
 class HexEditor : public GUI::ScrollableWidget {
     C_OBJECT(HexEditor)

Applications/HexEditor/HexEditorWidget.cpp

@@ -28,19 +28,19 @@
 #include <AK/Optional.h>
 #include <AK/StringBuilder.h>
 #include <LibCore/File.h>
-#include <LibGUI/GAboutDialog.h>
-#include <LibGUI/GAction.h>
-#include <LibGUI/GBoxLayout.h>
-#include <LibGUI/GButton.h>
-#include <LibGUI/GFilePicker.h>
-#include <LibGUI/GFontDatabase.h>
-#include <LibGUI/GInputBox.h>
-#include <LibGUI/GMenuBar.h>
-#include <LibGUI/GMessageBox.h>
-#include <LibGUI/GStatusBar.h>
-#include <LibGUI/GTextBox.h>
-#include <LibGUI/GTextEditor.h>
-#include <LibGUI/GToolBar.h>
+#include <LibGUI/AboutDialog.h>
+#include <LibGUI/Action.h>
+#include <LibGUI/BoxLayout.h>
+#include <LibGUI/Button.h>
+#include <LibGUI/FilePicker.h>
+#include <LibGUI/FontDatabase.h>
+#include <LibGUI/InputBox.h>
+#include <LibGUI/MenuBar.h>
+#include <LibGUI/MessageBox.h>
+#include <LibGUI/StatusBar.h>
+#include <LibGUI/TextBox.h>
+#include <LibGUI/TextEditor.h>
+#include <LibGUI/ToolBar.h>
 #include <stdio.h>
 
 HexEditorWidget::HexEditorWidget()

Applications/HexEditor/HexEditorWidget.h

@@ -29,10 +29,10 @@
 #include "HexEditor.h"
 #include <AK/FileSystemPath.h>
 #include <AK/Function.h>
-#include <LibGUI/GApplication.h>
-#include <LibGUI/GTextEditor.h>
-#include <LibGUI/GWidget.h>
-#include <LibGUI/GWindow.h>
+#include <LibGUI/Application.h>
+#include <LibGUI/TextEditor.h>
+#include <LibGUI/Widget.h>
+#include <LibGUI/Window.h>
 
 namespace GUI {
 class StatusBar;

Applications/IRCClient/IRCAppWindow.cpp

@@ -28,17 +28,17 @@
 #include "IRCChannel.h"
 #include "IRCWindow.h"
 #include "IRCWindowListModel.h"
-#include <LibGUI/GAboutDialog.h>
-#include <LibGUI/GAction.h>
-#include <LibGUI/GApplication.h>
-#include <LibGUI/GBoxLayout.h>
-#include <LibGUI/GInputBox.h>
-#include <LibGUI/GMenu.h>
-#include <LibGUI/GMenuBar.h>
-#include <LibGUI/GSplitter.h>
-#include <LibGUI/GStackWidget.h>
-#include <LibGUI/GTableView.h>
-#include <LibGUI/GToolBar.h>
+#include <LibGUI/AboutDialog.h>
+#include <LibGUI/Action.h>
+#include <LibGUI/Application.h>
+#include <LibGUI/BoxLayout.h>
+#include <LibGUI/InputBox.h>
+#include <LibGUI/Menu.h>
+#include <LibGUI/MenuBar.h>
+#include <LibGUI/Splitter.h>
+#include <LibGUI/StackWidget.h>
+#include <LibGUI/TableView.h>
+#include <LibGUI/ToolBar.h>
 #include <stdio.h>
 #include <stdlib.h>
 

Applications/IRCClient/IRCAppWindow.h

@@ -28,8 +28,8 @@
 
 #include "IRCClient.h"
 #include "IRCWindow.h"
-#include <LibGUI/GWidget.h>
-#include <LibGUI/GWindow.h>
+#include <LibGUI/Widget.h>
+#include <LibGUI/Window.h>
 
 namespace GUI {
 class StackWidget;

Applications/IRCClient/IRCChannelMemberListModel.h

@@ -27,7 +27,7 @@
 #pragma once
 
 #include <AK/Function.h>
-#include <LibGUI/GModel.h>
+#include <LibGUI/Model.h>
 
 class IRCChannel;
 

Applications/IRCClient/IRCWindow.cpp

@@ -28,11 +28,11 @@
 #include "IRCChannel.h"
 #include "IRCChannelMemberListModel.h"
 #include "IRCClient.h"
-#include <LibGUI/GBoxLayout.h>
-#include <LibGUI/GSplitter.h>
-#include <LibGUI/GTableView.h>
-#include <LibGUI/GTextBox.h>
-#include <LibGUI/GTextEditor.h>
+#include <LibGUI/BoxLayout.h>
+#include <LibGUI/Splitter.h>
+#include <LibGUI/TableView.h>
+#include <LibGUI/TextBox.h>
+#include <LibGUI/TextEditor.h>
 #include <LibHTML/HtmlView.h>
 
 IRCWindow::IRCWindow(IRCClient& client, void* owner, Type type, const String& name, GUI::Widget* parent)

Applications/IRCClient/IRCWindow.h

@@ -26,7 +26,7 @@
 
 #pragma once
 
-#include <LibGUI/GWidget.h>
+#include <LibGUI/Widget.h>
 
 namespace GUI {
 class TextEditor;

Applications/IRCClient/IRCWindowListModel.h

@@ -27,7 +27,7 @@
 #pragma once
 
 #include <AK/Function.h>
-#include <LibGUI/GModel.h>
+#include <LibGUI/Model.h>
 
 class IRCClient;
 class IRCWindow;

Applications/IRCClient/main.cpp

@@ -26,7 +26,7 @@
 
 #include "IRCAppWindow.h"
 #include "IRCClient.h"
-#include <LibGUI/GApplication.h>
+#include <LibGUI/Application.h>
 #include <stdio.h>
 
 int main(int argc, char** argv)

Applications/PaintBrush/BucketTool.cpp

@@ -28,7 +28,7 @@
 #include "PaintableWidget.h"
 #include <AK/Queue.h>
 #include <AK/SinglyLinkedList.h>
-#include <LibGUI/GPainter.h>
+#include <LibGUI/Painter.h>
 #include <LibGfx/Bitmap.h>
 #include <stdio.h>
 

Applications/PaintBrush/EllipseTool.cpp

@@ -27,9 +27,9 @@
 #include "EllipseTool.h"
 #include "PaintableWidget.h"
 #include <LibGfx/Rect.h>
-#include <LibGUI/GAction.h>
-#include <LibGUI/GMenu.h>
-#include <LibGUI/GPainter.h>
+#include <LibGUI/Action.h>
+#include <LibGUI/Menu.h>
+#include <LibGUI/Painter.h>
 #include <LibM/math.h>
 
 EllipseTool::EllipseTool()

Applications/PaintBrush/EllipseTool.h

@@ -28,7 +28,7 @@
 
 #include "Tool.h"
 #include <LibGfx/Point.h>
-#include <LibGUI/GActionGroup.h>
+#include <LibGUI/ActionGroup.h>
 
 namespace GUI {
 class Menu;

Applications/PaintBrush/EraseTool.cpp

@@ -26,9 +26,9 @@
 
 #include "EraseTool.h"
 #include "PaintableWidget.h"
-#include <LibGUI/GAction.h>
-#include <LibGUI/GMenu.h>
-#include <LibGUI/GPainter.h>
+#include <LibGUI/Action.h>
+#include <LibGUI/Menu.h>
+#include <LibGUI/Painter.h>
 
 EraseTool::EraseTool()
 {

Applications/PaintBrush/EraseTool.h

@@ -28,7 +28,7 @@
 
 #include "Tool.h"
 #include <LibGfx/Point.h>
-#include <LibGUI/GActionGroup.h>
+#include <LibGUI/ActionGroup.h>
 
 namespace GUI {
 class Menu;

Applications/PaintBrush/LineTool.cpp

@@ -26,9 +26,9 @@
 
 #include "LineTool.h"
 #include "PaintableWidget.h"
-#include <LibGUI/GAction.h>
-#include <LibGUI/GMenu.h>
-#include <LibGUI/GPainter.h>
+#include <LibGUI/Action.h>
+#include <LibGUI/Menu.h>
+#include <LibGUI/Painter.h>
 #include <LibM/math.h>
 
 static Gfx::Point constrain_line_angle(const Gfx::Point& start_pos, const Gfx::Point& end_pos, float angle_increment)

Applications/PaintBrush/LineTool.h

@@ -28,7 +28,7 @@
 
 #include "Tool.h"
 #include <LibGfx/Point.h>
-#include <LibGUI/GActionGroup.h>
+#include <LibGUI/ActionGroup.h>
 
 namespace GUI {
 class Menu;

Applications/PaintBrush/PaintableWidget.cpp

@@ -28,7 +28,7 @@
 #include "Tool.h"
 #include <LibGfx/Bitmap.h>
 #include <LibGfx/Palette.h>
-#include <LibGUI/GPainter.h>
+#include <LibGUI/Painter.h>
 
 static PaintableWidget* s_the;
 

Applications/PaintBrush/PaintableWidget.h

@@ -26,7 +26,7 @@
 
 #pragma once
 
-#include <LibGUI/GWidget.h>
+#include <LibGUI/Widget.h>
 class Tool;
 
 class PaintableWidget final : public GUI::Widget {

Applications/PaintBrush/PaletteWidget.cpp

@@ -26,8 +26,8 @@
 
 #include "PaletteWidget.h"
 #include "PaintableWidget.h"
-#include <LibGUI/GBoxLayout.h>
-#include <LibGUI/GColorPicker.h>
+#include <LibGUI/BoxLayout.h>
+#include <LibGUI/ColorPicker.h>
 
 class ColorWidget : public GUI::Frame {
     C_OBJECT(ColorWidget)

Applications/PaintBrush/PaletteWidget.h

@@ -26,7 +26,7 @@
 
 #pragma once
 
-#include <LibGUI/GFrame.h>
+#include <LibGUI/Frame.h>
 
 class PaintableWidget;
 

Applications/PaintBrush/PenTool.cpp

@@ -26,9 +26,9 @@
 
 #include "PenTool.h"
 #include "PaintableWidget.h"
-#include <LibGUI/GAction.h>
-#include <LibGUI/GMenu.h>
-#include <LibGUI/GPainter.h>
+#include <LibGUI/Action.h>
+#include <LibGUI/Menu.h>
+#include <LibGUI/Painter.h>
 
 PenTool::PenTool()
 {

Applications/PaintBrush/PenTool.h

@@ -28,7 +28,7 @@
 
 #include "Tool.h"
 #include <LibGfx/Point.h>
-#include <LibGUI/GActionGroup.h>
+#include <LibGUI/ActionGroup.h>
 
 namespace GUI {
 class Menu;

Applications/PaintBrush/RectangleTool.cpp

@@ -27,9 +27,9 @@
 #include "RectangleTool.h"
 #include "PaintableWidget.h"
 #include <LibGfx/Rect.h>
-#include <LibGUI/GAction.h>
-#include <LibGUI/GMenu.h>
-#include <LibGUI/GPainter.h>
+#include <LibGUI/Action.h>
+#include <LibGUI/Menu.h>
+#include <LibGUI/Painter.h>
 #include <LibM/math.h>
 
 RectangleTool::RectangleTool()

Applications/PaintBrush/SprayTool.cpp

@@ -28,9 +28,9 @@
 #include "PaintableWidget.h"
 #include <AK/Queue.h>
 #include <AK/SinglyLinkedList.h>
-#include <LibGUI/GPainter.h>
-#include <LibGUI/GAction.h>
-#include <LibGUI/GMenu.h>
+#include <LibGUI/Painter.h>
+#include <LibGUI/Action.h>
+#include <LibGUI/Menu.h>
 #include <LibGfx/Bitmap.h>
 #include <stdio.h>
 #include <LibM/math.h>

Applications/PaintBrush/SprayTool.h

@@ -28,8 +28,8 @@
 
 #include "Tool.h"
 #include <LibCore/Timer.h>
-#include <LibGUI/GActionGroup.h>
-#include <LibGUI/GPainter.h>
+#include <LibGUI/ActionGroup.h>
+#include <LibGUI/Painter.h>
 
 namespace GUI {
 class Menu;

Applications/PaintBrush/ToolboxWidget.cpp

@@ -34,8 +34,8 @@
 #include "PickerTool.h"
 #include "RectangleTool.h"
 #include "SprayTool.h"
-#include <LibGUI/GBoxLayout.h>
-#include <LibGUI/GButton.h>
+#include <LibGUI/BoxLayout.h>
+#include <LibGUI/Button.h>
 
 class ToolButton final : public GUI::Button {
     C_OBJECT(ToolButton)

Applications/PaintBrush/ToolboxWidget.h

@@ -26,7 +26,7 @@
 
 #pragma once
 
-#include <LibGUI/GFrame.h>
+#include <LibGUI/Frame.h>
 
 class ToolboxWidget final : public GUI::Frame {
     C_OBJECT(ToolboxWidget)

Applications/PaintBrush/main.cpp

@@ -27,15 +27,15 @@
 #include "PaintableWidget.h"
 #include "PaletteWidget.h"
 #include "ToolboxWidget.h"
-#include <LibGUI/GAboutDialog.h>
-#include <LibGUI/GAction.h>
-#include <LibGUI/GApplication.h>
-#include <LibGUI/GBoxLayout.h>
-#include <LibGUI/GFilePicker.h>
-#include <LibGUI/GMenu.h>
-#include <LibGUI/GMenuBar.h>
-#include <LibGUI/GMessageBox.h>
-#include <LibGUI/GWindow.h>
+#include <LibGUI/AboutDialog.h>
+#include <LibGUI/Action.h>
+#include <LibGUI/Application.h>
+#include <LibGUI/BoxLayout.h>
+#include <LibGUI/FilePicker.h>
+#include <LibGUI/Menu.h>
+#include <LibGUI/MenuBar.h>
+#include <LibGUI/MessageBox.h>
+#include <LibGUI/Window.h>
 #include <stdio.h>
 
 int main(int argc, char** argv)

Applications/Piano/KeysWidget.cpp

@@ -27,7 +27,7 @@
 
 #include "KeysWidget.h"
 #include "AudioEngine.h"
-#include <LibGUI/GPainter.h>
+#include <LibGUI/Painter.h>
 
 KeysWidget::KeysWidget(GUI::Widget* parent, AudioEngine& audio_engine)
     : GUI::Frame(parent)

Applications/Piano/KeysWidget.h

@@ -28,7 +28,7 @@
 #pragma once
 
 #include "Music.h"
-#include <LibGUI/GFrame.h>
+#include <LibGUI/Frame.h>
 
 class AudioEngine;
 

Applications/Piano/KnobsWidget.cpp

@@ -28,9 +28,9 @@
 #include "KnobsWidget.h"
 #include "AudioEngine.h"
 #include "MainWidget.h"
-#include <LibGUI/GBoxLayout.h>
-#include <LibGUI/GLabel.h>
-#include <LibGUI/GSlider.h>
+#include <LibGUI/BoxLayout.h>
+#include <LibGUI/Label.h>
+#include <LibGUI/Slider.h>
 
 KnobsWidget::KnobsWidget(GUI::Widget* parent, AudioEngine& audio_engine, MainWidget& main_widget)
     : GUI::Frame(parent)

Applications/Piano/KnobsWidget.h

@@ -27,7 +27,7 @@
 
 #pragma once
 
-#include <LibGUI/GFrame.h>
+#include <LibGUI/Frame.h>
 
 namespace GUI {
 class Label;

Applications/Piano/MainWidget.cpp

@@ -31,7 +31,7 @@
 #include "KnobsWidget.h"
 #include "RollWidget.h"
 #include "WaveWidget.h"
-#include <LibGUI/GBoxLayout.h>
+#include <LibGUI/BoxLayout.h>
 
 MainWidget::MainWidget(AudioEngine& audio_engine)
     : m_audio_engine(audio_engine)

Applications/Piano/MainWidget.h

@@ -28,7 +28,7 @@
 #pragma once
 
 #include "Music.h"
-#include <LibGUI/GWidget.h>
+#include <LibGUI/Widget.h>
 
 class AudioEngine;
 class WaveWidget;

Applications/Piano/RollWidget.cpp

@@ -27,8 +27,8 @@
 
 #include "RollWidget.h"
 #include "AudioEngine.h"
-#include <LibGUI/GPainter.h>
-#include <LibGUI/GScrollBar.h>
+#include <LibGUI/Painter.h>
+#include <LibGUI/ScrollBar.h>
 
 constexpr int note_height = 20;
 constexpr int roll_height = note_count * note_height;

Applications/Piano/RollWidget.h

@@ -28,7 +28,7 @@
 #pragma once
 
 #include "Music.h"
-#include <LibGUI/GScrollableWidget.h>
+#include <LibGUI/ScrollableWidget.h>
 
 class AudioEngine;
 

Applications/Piano/WaveWidget.cpp

@@ -27,7 +27,7 @@
 
 #include "WaveWidget.h"
 #include "AudioEngine.h"
-#include <LibGUI/GPainter.h>
+#include <LibGUI/Painter.h>
 #include <limits>
 
 WaveWidget::WaveWidget(GUI::Widget* parent, AudioEngine& audio_engine)

Applications/Piano/WaveWidget.h

@@ -27,7 +27,7 @@
 
 #pragma once
 
-#include <LibGUI/GFrame.h>
+#include <LibGUI/Frame.h>
 
 class AudioEngine;
 

Applications/Piano/main.cpp

@@ -30,13 +30,13 @@
 #include <LibAudio/ClientConnection.h>
 #include <LibAudio/WavWriter.h>
 #include <LibCore/File.h>
-#include <LibGUI/GAboutDialog.h>
-#include <LibGUI/GAction.h>
-#include <LibGUI/GApplication.h>
-#include <LibGUI/GFilePicker.h>
-#include <LibGUI/GMenuBar.h>
-#include <LibGUI/GMessageBox.h>
-#include <LibGUI/GWindow.h>
+#include <LibGUI/AboutDialog.h>
+#include <LibGUI/Action.h>
+#include <LibGUI/Application.h>
+#include <LibGUI/FilePicker.h>
+#include <LibGUI/MenuBar.h>
+#include <LibGUI/MessageBox.h>
+#include <LibGUI/Window.h>
 #include <LibThread/Thread.h>
 
 int main(int argc, char** argv)

Applications/QuickShow/QSWidget.cpp

@@ -27,9 +27,9 @@
 #include "QSWidget.h"
 #include <AK/URL.h>
 #include <LibGfx/Bitmap.h>
-#include <LibGUI/GMessageBox.h>
-#include <LibGUI/GPainter.h>
-#include <LibGUI/GWindow.h>
+#include <LibGUI/MessageBox.h>
+#include <LibGUI/Painter.h>
+#include <LibGUI/Window.h>
 
 QSWidget::QSWidget(GUI::Widget* parent)
     : GUI::Frame(parent)

Applications/QuickShow/QSWidget.h

@@ -26,7 +26,7 @@
 
 #pragma once
 
-#include <LibGUI/GFrame.h>
+#include <LibGUI/Frame.h>
 
 class QSLabel;
 

Applications/QuickShow/main.cpp

@@ -25,13 +25,13 @@
  */
 
 #include "QSWidget.h"
-#include <LibGUI/GAction.h>
-#include <LibGUI/GApplication.h>
-#include <LibGUI/GBoxLayout.h>
-#include <LibGUI/GLabel.h>
-#include <LibGUI/GMenu.h>
-#include <LibGUI/GMenuBar.h>
-#include <LibGUI/GWindow.h>
+#include <LibGUI/Action.h>
+#include <LibGUI/Application.h>
+#include <LibGUI/BoxLayout.h>
+#include <LibGUI/Label.h>
+#include <LibGUI/Menu.h>
+#include <LibGUI/MenuBar.h>
+#include <LibGUI/Window.h>
 #include <stdio.h>
 
 int main(int argc, char** argv)

Applications/SoundPlayer/SampleWidget.cpp

@@ -26,7 +26,7 @@
 
 #include "SampleWidget.h"
 #include <LibAudio/Buffer.h>
-#include <LibGUI/GPainter.h>
+#include <LibGUI/Painter.h>
 #include <LibM/math.h>
 
 SampleWidget::SampleWidget(GUI::Widget* parent)

Applications/SoundPlayer/SampleWidget.h

@@ -26,7 +26,7 @@
 
 #pragma once
 
-#include <LibGUI/GFrame.h>
+#include <LibGUI/Frame.h>
 
 namespace Audio {
 class Buffer;

Applications/SoundPlayer/SoundPlayerWidget.cpp

@@ -26,10 +26,10 @@
 
 #include "SoundPlayerWidget.h"
 #include <AK/StringBuilder.h>
-#include <LibGUI/GBoxLayout.h>
-#include <LibGUI/GButton.h>
-#include <LibGUI/GLabel.h>
-#include <LibGUI/GMessageBox.h>
+#include <LibGUI/BoxLayout.h>
+#include <LibGUI/Button.h>
+#include <LibGUI/Label.h>
+#include <LibGUI/MessageBox.h>
 #include <LibM/math.h>
 
 SoundPlayerWidget::SoundPlayerWidget(GUI::Window& window, NonnullRefPtr<Audio::ClientConnection> connection)

Applications/SoundPlayer/SoundPlayerWidget.h

@@ -28,11 +28,11 @@
 
 #include "PlaybackManager.h"
 #include "SampleWidget.h"
-#include <LibGUI/GButton.h>
-#include <LibGUI/GLabel.h>
-#include <LibGUI/GSlider.h>
-#include <LibGUI/GWidget.h>
-#include <LibGUI/GWindow.h>
+#include <LibGUI/Button.h>
+#include <LibGUI/Label.h>
+#include <LibGUI/Slider.h>
+#include <LibGUI/Widget.h>
+#include <LibGUI/Window.h>
 
 class SoundPlayerWidget final : public GUI::Widget {
     C_OBJECT(SoundPlayerWidget)

Applications/SoundPlayer/main.cpp

@@ -27,13 +27,13 @@
 #include "SoundPlayerWidget.h"
 #include <LibAudio/ClientConnection.h>
 #include <LibGfx/CharacterBitmap.h>
-#include <LibGUI/GAboutDialog.h>
-#include <LibGUI/GAction.h>
-#include <LibGUI/GApplication.h>
-#include <LibGUI/GFilePicker.h>
-#include <LibGUI/GMenu.h>
-#include <LibGUI/GMenuBar.h>
-#include <LibGUI/GWindow.h>
+#include <LibGUI/AboutDialog.h>
+#include <LibGUI/Action.h>
+#include <LibGUI/Application.h>
+#include <LibGUI/FilePicker.h>
+#include <LibGUI/Menu.h>
+#include <LibGUI/MenuBar.h>
+#include <LibGUI/Window.h>
 #include <stdio.h>
 
 int main(int argc, char** argv)

Applications/SystemDialog/main.cpp

@@ -24,13 +24,13 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <LibGUI/GApplication.h>
-#include <LibGUI/GBoxLayout.h>
-#include <LibGUI/GButton.h>
-#include <LibGUI/GDesktop.h>
-#include <LibGUI/GLabel.h>
-#include <LibGUI/GMessageBox.h>
-#include <LibGUI/GWindow.h>
+#include <LibGUI/Application.h>
+#include <LibGUI/BoxLayout.h>
+#include <LibGUI/Button.h>
+#include <LibGUI/Desktop.h>
+#include <LibGUI/Label.h>
+#include <LibGUI/MessageBox.h>
+#include <LibGUI/Window.h>
 #include <stdio.h>
 #include <sys/utsname.h>
 

Applications/SystemMonitor/DevicesModel.h

@@ -28,7 +28,7 @@
 
 #include <AK/String.h>
 #include <AK/Vector.h>
-#include <LibGUI/GModel.h>
+#include <LibGUI/Model.h>
 
 class DevicesModel final : public GUI::Model {
 public:

Applications/SystemMonitor/GraphWidget.cpp

@@ -25,7 +25,7 @@
  */
 
 #include "GraphWidget.h"
-#include <LibGUI/GPainter.h>
+#include <LibGUI/Painter.h>
 
 GraphWidget::GraphWidget(GUI::Widget* parent)
     : GUI::Frame(parent)

Applications/SystemMonitor/GraphWidget.h

@@ -25,7 +25,7 @@
  */
 
 #include <AK/CircularQueue.h>
-#include <LibGUI/GFrame.h>
+#include <LibGUI/Frame.h>
 
 class GraphWidget final : public GUI::Frame {
     C_OBJECT(GraphWidget)

Applications/SystemMonitor/MemoryStatsWidget.cpp

@@ -29,9 +29,9 @@
 #include <AK/JsonObject.h>
 #include <LibCore/File.h>
 #include <LibGfx/StylePainter.h>
-#include <LibGUI/GBoxLayout.h>
-#include <LibGUI/GLabel.h>
-#include <LibGUI/GPainter.h>
+#include <LibGUI/BoxLayout.h>
+#include <LibGUI/Label.h>
+#include <LibGUI/Painter.h>
 #include <stdio.h>
 #include <stdlib.h>
 

Applications/SystemMonitor/MemoryStatsWidget.h

@@ -26,7 +26,7 @@
 
 #pragma once
 
-#include <LibGUI/GWidget.h>
+#include <LibGUI/Widget.h>
 
 namespace GUI {
 class Label;

Applications/SystemMonitor/NetworkStatisticsWidget.cpp

@@ -25,10 +25,10 @@
  */
 
 #include "NetworkStatisticsWidget.h"
-#include <LibGUI/GBoxLayout.h>
-#include <LibGUI/GGroupBox.h>
-#include <LibGUI/GJsonArrayModel.h>
-#include <LibGUI/GTableView.h>
+#include <LibGUI/BoxLayout.h>
+#include <LibGUI/GroupBox.h>
+#include <LibGUI/JsonArrayModel.h>
+#include <LibGUI/TableView.h>
 
 NetworkStatisticsWidget::NetworkStatisticsWidget(GUI::Widget* parent)
     : GUI::LazyWidget(parent)

Applications/SystemMonitor/NetworkStatisticsWidget.h

@@ -27,7 +27,7 @@
 #pragma once
 
 #include <LibCore/Timer.h>
-#include <LibGUI/GLazyWidget.h>
+#include <LibGUI/LazyWidget.h>
 
 namespace GUI {
 class TableView;

Applications/SystemMonitor/ProcessFileDescriptorMapWidget.cpp

@@ -25,9 +25,9 @@
  */
 
 #include "ProcessFileDescriptorMapWidget.h"
-#include <LibGUI/GBoxLayout.h>
-#include <LibGUI/GJsonArrayModel.h>
-#include <LibGUI/GTableView.h>
+#include <LibGUI/BoxLayout.h>
+#include <LibGUI/JsonArrayModel.h>
+#include <LibGUI/TableView.h>
 
 ProcessFileDescriptorMapWidget::ProcessFileDescriptorMapWidget(GUI::Widget* parent)
     : GUI::Widget(parent)

Applications/SystemMonitor/ProcessFileDescriptorMapWidget.h

@@ -26,7 +26,7 @@
 
 #pragma once
 
-#include <LibGUI/GWidget.h>
+#include <LibGUI/Widget.h>
 
 namespace GUI {
 class TableView;

Applications/SystemMonitor/ProcessMemoryMapWidget.cpp

@@ -26,10 +26,10 @@
 
 #include "ProcessMemoryMapWidget.h"
 #include <LibCore/Timer.h>
-#include <LibGUI/GBoxLayout.h>
-#include <LibGUI/GJsonArrayModel.h>
-#include <LibGUI/GSortingProxyModel.h>
-#include <LibGUI/GTableView.h>
+#include <LibGUI/BoxLayout.h>
+#include <LibGUI/JsonArrayModel.h>
+#include <LibGUI/SortingProxyModel.h>
+#include <LibGUI/TableView.h>
 
 ProcessMemoryMapWidget::ProcessMemoryMapWidget(GUI::Widget* parent)
     : GUI::Widget(parent)

Applications/SystemMonitor/ProcessMemoryMapWidget.h

@@ -26,7 +26,7 @@
 
 #pragma once
 
-#include <LibGUI/GWidget.h>
+#include <LibGUI/Widget.h>
 
 namespace Core {
 class Timer;

Applications/SystemMonitor/ProcessModel.h

@@ -29,7 +29,7 @@
 #include <AK/HashMap.h>
 #include <AK/String.h>
 #include <AK/Vector.h>
-#include <LibGUI/GModel.h>
+#include <LibGUI/Model.h>
 #include <unistd.h>
 
 class GraphWidget;

Applications/SystemMonitor/ProcessStacksWidget.cpp

@@ -27,7 +27,7 @@
 #include "ProcessStacksWidget.h"
 #include <LibCore/File.h>
 #include <LibCore/Timer.h>
-#include <LibGUI/GBoxLayout.h>
+#include <LibGUI/BoxLayout.h>
 
 ProcessStacksWidget::ProcessStacksWidget(GUI::Widget* parent)
     : GUI::Widget(parent)

Applications/SystemMonitor/ProcessStacksWidget.h

@@ -26,8 +26,8 @@
 
 #pragma once
 
-#include <LibGUI/GTextEditor.h>
-#include <LibGUI/GWidget.h>
+#include <LibGUI/TextEditor.h>
+#include <LibGUI/Widget.h>
 
 namespace Core {
 class Timer;

Applications/SystemMonitor/ProcessTableView.cpp

@@ -26,7 +26,7 @@
 
 #include "ProcessTableView.h"
 #include "ProcessModel.h"
-#include <LibGUI/GSortingProxyModel.h>
+#include <LibGUI/SortingProxyModel.h>
 #include <stdio.h>
 
 ProcessTableView::ProcessTableView(GUI::Widget* parent)

Applications/SystemMonitor/ProcessTableView.h

@@ -27,7 +27,7 @@
 #pragma once
 
 #include <AK/Function.h>
-#include <LibGUI/GTableView.h>
+#include <LibGUI/TableView.h>
 #include <unistd.h>
 
 class GraphWidget;

Applications/SystemMonitor/ProcessUnveiledPathsWidget.cpp

@@ -25,9 +25,9 @@
  */
 
 #include "ProcessUnveiledPathsWidget.h"
-#include <LibGUI/GBoxLayout.h>
-#include <LibGUI/GJsonArrayModel.h>
-#include <LibGUI/GTableView.h>
+#include <LibGUI/BoxLayout.h>
+#include <LibGUI/JsonArrayModel.h>
+#include <LibGUI/TableView.h>
 
 ProcessUnveiledPathsWidget::ProcessUnveiledPathsWidget(GUI::Widget* parent)
     : GUI::Widget(parent)

Applications/SystemMonitor/ProcessUnveiledPathsWidget.h

@@ -26,7 +26,7 @@
 
 #pragma once
 
-#include <LibGUI/GWidget.h>
+#include <LibGUI/Widget.h>
 
 namespace GUI {
 class TableView;

Applications/SystemMonitor/main.cpp

@@ -35,23 +35,23 @@
 #include "ProcessTableView.h"
 #include "ProcessUnveiledPathsWidget.h"
 #include <LibCore/Timer.h>
-#include <LibGUI/GAboutDialog.h>
-#include <LibGUI/GAction.h>
-#include <LibGUI/GActionGroup.h>
-#include <LibGUI/GApplication.h>
-#include <LibGUI/GBoxLayout.h>
-#include <LibGUI/GGroupBox.h>
-#include <LibGUI/GJsonArrayModel.h>
-#include <LibGUI/GLabel.h>
-#include <LibGUI/GLazyWidget.h>
-#include <LibGUI/GMenuBar.h>
-#include <LibGUI/GPainter.h>
-#include <LibGUI/GSortingProxyModel.h>
-#include <LibGUI/GSplitter.h>
-#include <LibGUI/GTabWidget.h>
-#include <LibGUI/GToolBar.h>
-#include <LibGUI/GWidget.h>
-#include <LibGUI/GWindow.h>
+#include <LibGUI/AboutDialog.h>
+#include <LibGUI/Action.h>
+#include <LibGUI/ActionGroup.h>
+#include <LibGUI/Application.h>
+#include <LibGUI/BoxLayout.h>
+#include <LibGUI/GroupBox.h>
+#include <LibGUI/JsonArrayModel.h>
+#include <LibGUI/Label.h>
+#include <LibGUI/LazyWidget.h>
+#include <LibGUI/MenuBar.h>
+#include <LibGUI/Painter.h>
+#include <LibGUI/SortingProxyModel.h>
+#include <LibGUI/Splitter.h>
+#include <LibGUI/TabWidget.h>
+#include <LibGUI/ToolBar.h>
+#include <LibGUI/Widget.h>
+#include <LibGUI/Window.h>
 #include <LibPCIDB/Database.h>
 #include <signal.h>
 #include <stdio.h>

Applications/Taskbar/TaskbarButton.cpp

@@ -25,8 +25,8 @@
  */
 
 #include "TaskbarButton.h"
-#include <LibGUI/GAction.h>
-#include <LibGUI/GWindowServerConnection.h>
+#include <LibGUI/Action.h>
+#include <LibGUI/WindowServerConnection.h>
 
 TaskbarButton::TaskbarButton(const WindowIdentifier& identifier, GUI::Widget* parent)
     : GUI::Button(parent)

Applications/Taskbar/TaskbarButton.h

@@ -27,7 +27,7 @@
 #pragma once
 
 #include "WindowIdentifier.h"
-#include <LibGUI/GButton.h>
+#include <LibGUI/Button.h>
 
 class TaskbarButton final : public GUI::Button {
     C_OBJECT(TaskbarButton)

Applications/Taskbar/TaskbarWindow.cpp

@@ -28,11 +28,11 @@
 #include "TaskbarButton.h"
 #include <AK/SharedBuffer.h>
 #include <LibCore/ConfigFile.h>
-#include <LibGUI/GBoxLayout.h>
-#include <LibGUI/GButton.h>
-#include <LibGUI/GDesktop.h>
-#include <LibGUI/GFrame.h>
-#include <LibGUI/GWindow.h>
+#include <LibGUI/BoxLayout.h>
+#include <LibGUI/Button.h>
+#include <LibGUI/Desktop.h>
+#include <LibGUI/Frame.h>
+#include <LibGUI/Window.h>
 #include <stdio.h>
 
 //#define EVENT_DEBUG