Moved more includes.

editor/editor_profiler.cpp

@@ -33,6 +33,7 @@
 #include "core/os/os.h"
 #include "editor_scale.h"
 #include "editor_settings.h"
+#include "scene/main/timer.h"
 
 void EditorProfiler::_make_metric_ptrs(Metric &m) {
 	for (int i = 0; i < m.categories.size(); i++) {

editor/plugins/sprite_editor_plugin.cpp

@@ -38,6 +38,7 @@
 #include "scene/2d/polygon_2d.h"
 #include "scene/gui/box_container.h"
 #include "thirdparty/misc/clipper.hpp"
+#include "scene/resources/bit_map.h"
 
 void SpriteEditor::_node_removed(Node *p_node) {
 	if (p_node == node) {

scene/gui/color_picker.cpp

@@ -45,6 +45,7 @@
 #include "scene/gui/texture_rect.h"
 #include "scene/gui/tool_button.h"
 #include "scene/gui/shortcut.h"
+#include "scene/gui/popup_menu.h"
 
 #ifdef TOOLS_ENABLED
 #include "editor/editor_scale.h"

scene/gui/item_list.cpp

@@ -31,6 +31,7 @@
 #include "item_list.h"
 #include "core/os/os.h"
 #include "core/project_settings.h"
+#include "scene/gui/scroll_bar.h"
 
 void ItemList::add_item(const String &p_item, const Ref<Texture> &p_texture, bool p_selectable) {
 	Item item;

scene/gui/item_list.h

@@ -32,7 +32,8 @@
 #define ITEMLIST_H
 
 #include "scene/gui/control.h"
-#include "scene/gui/scroll_bar.h"
+
+class VScrollBar;
 
 class ItemList : public Control {
 	GDCLASS(ItemList, Control);

scene/gui/line_edit.cpp

@@ -37,6 +37,7 @@
 #include "core/translation.h"
 #include "label.h"
 #include "scene/main/timer.h"
+#include "scene/gui/popup_menu.h"
 
 #ifdef TOOLS_ENABLED
 #include "editor/editor_scale.h"

scene/gui/line_edit.h

@@ -32,7 +32,8 @@
 #define LINE_EDIT_H
 
 #include "scene/gui/control.h"
-#include "scene/gui/popup_menu.h"
+
+class PopupMenu;
 
 class LineEdit : public Control {
 	GDCLASS(LineEdit, Control);

scene/gui/link_button.cpp

@@ -31,6 +31,7 @@
 #include "link_button.h"
 
 #include "core/translation.h"
+#include "scene/gui/shortcut.h"
 
 void LinkButton::set_text(const String &p_text) {
 	if (text == p_text) {

scene/gui/link_button.h

@@ -32,7 +32,6 @@
 #define LINKBUTTON_H
 
 #include "scene/gui/base_button.h"
-#include "scene/resources/bit_map.h"
 
 class LinkButton : public BaseButton {
 	GDCLASS(LinkButton, BaseButton);

scene/gui/menu_button.cpp

@@ -33,6 +33,7 @@
 #include "core/os/keyboard.h"
 #include "scene/main/viewport.h"
 #include "scene/gui/shortcut.h"
+#include "scene/gui/popup_menu.h"
 
 void MenuButton::_unhandled_key_input(Ref<InputEvent> p_event) {
 	ERR_FAIL_COND(p_event.is_null());

scene/gui/menu_button.h

@@ -32,7 +32,8 @@
 #define MENU_BUTTON_H
 
 #include "scene/gui/button.h"
-#include "scene/gui/popup_menu.h"
+
+class PopupMenu;
 
 class MenuButton : public Button {
 	GDCLASS(MenuButton, Button);

scene/gui/option_button.cpp

@@ -32,6 +32,7 @@
 #include "core/os/input.h"
 #include "core/print_string.h"
 #include "scene/gui/shortcut.h"
+#include "scene/gui/popup_menu.h"
 
 Size2 OptionButton::get_minimum_size() const {
 	Size2 minsize = Button::get_minimum_size();

scene/gui/option_button.h

@@ -32,7 +32,8 @@
 #define OPTION_BUTTON_H
 
 #include "scene/gui/button.h"
-#include "scene/gui/popup_menu.h"
+
+class PopupMenu;
 
 class OptionButton : public Button {
 	GDCLASS(OptionButton, Button);

scene/gui/rich_text_label.cpp

@@ -34,6 +34,7 @@
 #include "core/os/keyboard.h"
 #include "core/os/os.h"
 #include "scene/scene_string_names.h"
+#include "scene/gui/scroll_bar.h"
 
 #ifdef TOOLS_ENABLED
 #include "editor/editor_scale.h"

scene/gui/rich_text_label.h

@@ -31,8 +31,11 @@
 #ifndef RICH_TEXT_LABEL_H
 #define RICH_TEXT_LABEL_H
 
+#include "scene/gui/control.h"
+
 #include "rich_text_effect.h"
-#include "scene/gui/scroll_bar.h"
+
+class VScrollBar;
 
 class RichTextLabel : public Control {
 	GDCLASS(RichTextLabel, Control);

scene/gui/scroll_container.cpp

@@ -31,6 +31,7 @@
 #include "scroll_container.h"
 #include "core/os/os.h"
 #include "scene/main/viewport.h"
+#include "scroll_bar.h"
 
 bool ScrollContainer::clips_input() const {
 	return true;

scene/gui/scroll_container.h

@@ -33,7 +33,8 @@
 
 #include "container.h"
 
-#include "scroll_bar.h"
+class HScrollBar;
+class VScrollBar;
 
 class ScrollContainer : public Container {
 	GDCLASS(ScrollContainer, Container);

scene/gui/shortcut.cpp

@@ -31,6 +31,7 @@
 #include "shortcut.h"
 
 #include "core/os/keyboard.h"
+#include "core/os/input_event.h"
 
 void ShortCut::set_shortcut(const Ref<InputEvent> &p_shortcut) {
 	shortcut = p_shortcut;
@@ -71,3 +72,6 @@ void ShortCut::_bind_methods() {
 
 ShortCut::ShortCut() {
 }
+
+ShortCut::~ShortCut() {
+}

scene/gui/shortcut.h

@@ -31,9 +31,10 @@
 #ifndef SHORTCUT_H
 #define SHORTCUT_H
 
-#include "core/os/input_event.h"
 #include "core/resource.h"
 
+class InputEvent;
+
 class ShortCut : public Resource {
 	GDCLASS(ShortCut, Resource);
 
@@ -51,6 +52,7 @@ public:
 	String get_as_text() const;
 
 	ShortCut();
+	~ShortCut();
 };
 
 #endif // SHORTCUT_H

scene/gui/spin_box.cpp

@@ -32,6 +32,8 @@
 #include "core/math/expression.h"
 #include "core/os/input.h"
 #include "scene/gui/shortcut.h"
+#include "scene/main/timer.h"
+#include "scene/gui/popup_menu.h"
 
 Size2 SpinBox::get_minimum_size() const {
 	Size2 ms = line_edit->get_combined_minimum_size();

scene/gui/spin_box.h

@@ -31,9 +31,10 @@
 #ifndef SPIN_BOX_H
 #define SPIN_BOX_H
 
-#include "scene/gui/line_edit.h"
 #include "scene/gui/range.h"
-#include "scene/main/timer.h"
+#include "scene/gui/line_edit.h"
+
+class Timer;
 
 class SpinBox : public Range {
 	GDCLASS(SpinBox, Range);

scene/gui/tab_container.cpp

@@ -34,6 +34,7 @@
 #include "scene/gui/box_container.h"
 #include "scene/gui/label.h"
 #include "scene/gui/texture_rect.h"
+#include "scene/gui/popup.h"
 
 int TabContainer::_get_top_margin() const {
 	if (!tabs_visible) {

scene/gui/tab_container.h

@@ -32,7 +32,9 @@
 #define TAB_CONTAINER_H
 
 #include "scene/gui/container.h"
-#include "scene/gui/popup.h"
+
+class Popup;
+
 class TabContainer : public Container {
 	GDCLASS(TabContainer, Container);