summaryrefslogtreecommitdiff
path: root/main
diff options
context:
space:
mode:
Diffstat (limited to 'main')
-rw-r--r--main/main.cpp6
-rw-r--r--main/main.h2
-rw-r--r--main/main_timer_sync.h2
-rw-r--r--main/performance.cpp2
-rw-r--r--main/performance.h4
5 files changed, 8 insertions, 8 deletions
diff --git a/main/main.cpp b/main/main.cpp
index 1866228a23..0667180c28 100644
--- a/main/main.cpp
+++ b/main/main.cpp
@@ -30,6 +30,7 @@
#include "main.h"
+#include "core/config/project_settings.h"
#include "core/core_string_names.h"
#include "core/crypto/crypto.h"
#include "core/debugger/engine_debugger.h"
@@ -41,12 +42,11 @@
#include "core/io/image_loader.h"
#include "core/io/ip.h"
#include "core/io/resource_loader.h"
-#include "core/message_queue.h"
+#include "core/object/message_queue.h"
#include "core/os/dir_access.h"
#include "core/os/os.h"
-#include "core/project_settings.h"
#include "core/register_core_types.h"
-#include "core/translation.h"
+#include "core/string/translation.h"
#include "core/version.h"
#include "core/version_hash.gen.h"
#include "drivers/register_driver_types.h"
diff --git a/main/main.h b/main/main.h
index 75a1c0d8cd..168b2e5e86 100644
--- a/main/main.h
+++ b/main/main.h
@@ -31,7 +31,7 @@
#ifndef MAIN_H
#define MAIN_H
-#include "core/error_list.h"
+#include "core/error/error_list.h"
#include "core/os/thread.h"
#include "core/typedefs.h"
diff --git a/main/main_timer_sync.h b/main/main_timer_sync.h
index 2126381c7c..f8497140cd 100644
--- a/main/main_timer_sync.h
+++ b/main/main_timer_sync.h
@@ -31,7 +31,7 @@
#ifndef MAIN_TIMER_SYNC_H
#define MAIN_TIMER_SYNC_H
-#include "core/engine.h"
+#include "core/config/engine.h"
struct MainFrameTime {
float idle_step; // time to advance idles for (argument to process())
diff --git a/main/performance.cpp b/main/performance.cpp
index 7234511aeb..3d7971ced3 100644
--- a/main/performance.cpp
+++ b/main/performance.cpp
@@ -30,7 +30,7 @@
#include "performance.h"
-#include "core/message_queue.h"
+#include "core/object/message_queue.h"
#include "core/os/os.h"
#include "scene/main/node.h"
#include "scene/main/scene_tree.h"
diff --git a/main/performance.h b/main/performance.h
index f406433cf2..415b49b58c 100644
--- a/main/performance.h
+++ b/main/performance.h
@@ -31,8 +31,8 @@
#ifndef PERFORMANCE_H
#define PERFORMANCE_H
-#include "core/class_db.h"
-#include "core/ordered_hash_map.h"
+#include "core/object/class_db.h"
+#include "core/templates/ordered_hash_map.h"
#define PERF_WARN_OFFLINE_FUNCTION
#define PERF_WARN_PROCESS_SYNC