10 files changed, 21 insertions, 21 deletions
diff --git a/gui/keyboard.h b/gui/keyboard.h
index 27300690..d35fe675 100644
--- a/gui/keyboard.h
+++ b/gui/keyboard.h
@@ -1,8 +1,8 @@
 #pragma once
 #include "ui_keyboard_listener.h"
 #ifdef _WIN32
-#include "opentrack-logic/win32-shortcuts.h"
-#include "opentrack-dinput/keybinding-worker.hpp"
+#include "logic/win32-shortcuts.h"
+#include "dinput/keybinding-worker.hpp"
 #endif
 #include <QLabel>
 #include <QKeyEvent>
diff --git a/gui/main-window.cpp b/gui/main-window.cpp
index 667c3032..70652201 100644
--- a/gui/main-window.cpp
+++ b/gui/main-window.cpp
@@ -7,8 +7,8 @@
  */
 
 #include "main-window.hpp"
-#include "opentrack-logic/tracker.h"
-#include "opentrack-compat/options.hpp"
+#include "logic/tracker.h"
+#include "compat/options.hpp"
 #include "opentrack-library-path.h"
 #include "new_file_dialog.h"
 #include <QFile>
diff --git a/gui/main-window.hpp b/gui/main-window.hpp
index b068d158..e05ee9cc 100644
--- a/gui/main-window.hpp
+++ b/gui/main-window.hpp
@@ -8,16 +8,16 @@
 
 #pragma once
 
-#include "opentrack/plugin-support.hpp"
+#include "api/plugin-support.hpp"
 #include "mapping-window.hpp"
 #include "options-dialog.hpp"
 #include "process_detector.h"
-#include "opentrack-logic/main-settings.hpp"
-#include "opentrack-logic/tracker.h"
-#include "opentrack-logic/shortcuts.h"
-#include "opentrack-logic/work.hpp"
-#include "opentrack-logic/state.hpp"
-#include "opentrack-compat/options.hpp"
+#include "logic/main-settings.hpp"
+#include "logic/tracker.h"
+#include "logic/shortcuts.h"
+#include "logic/work.hpp"
+#include "logic/state.hpp"
+#include "compat/options.hpp"
 
 #include <QMainWindow>
 #include <QKeySequence>
diff --git a/gui/main.cpp b/gui/main.cpp
index a9252c4d..43fd4539 100644
--- a/gui/main.cpp
+++ b/gui/main.cpp
@@ -9,8 +9,8 @@
 #endif
 
 #include "main-window.hpp"
-#include "opentrack-compat/options.hpp"
-#include "opentrack-compat/win32-com.hpp"
+#include "compat/options.hpp"
+#include "compat/win32-com.hpp"
 using namespace options;
 #include <QApplication>
 #include <QCommandLineParser>
diff --git a/gui/mapping-window.cpp b/gui/mapping-window.cpp
index 108e1354..12b36e2a 100644
--- a/gui/mapping-window.cpp
+++ b/gui/mapping-window.cpp
@@ -7,7 +7,7 @@
  */
 
 #include "mapping-window.hpp"
-#include "opentrack-logic/main-settings.hpp"
+#include "logic/main-settings.hpp"
 #include "spline-widget/spline-widget.hpp"
 MapWidget::MapWidget(Mappings& m) :
     m(m)
diff --git a/gui/mapping-window.hpp b/gui/mapping-window.hpp
index e70a27c6..aeaed211 100644
--- a/gui/mapping-window.hpp
+++ b/gui/mapping-window.hpp
@@ -1,6 +1,6 @@
 #pragma once
 #include <QWidget>
-#include "opentrack-logic/mappings.hpp"
+#include "logic/mappings.hpp"
 #include "ui_mapping-window.h"
 
 class MapWidget final : public QWidget
diff --git a/gui/new_file_dialog.h b/gui/new_file_dialog.h
index 5fdabb3a..8cb971c3 100644
--- a/gui/new_file_dialog.h
+++ b/gui/new_file_dialog.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "ui_new_config.h"
-#include "opentrack-compat/options.hpp"
+#include "compat/options.hpp"
 #include <QFile>
 #include <QRegExp>
 #include <QString>
diff --git a/gui/options-dialog.hpp b/gui/options-dialog.hpp
index 1e8faa1c..6854107e 100644
--- a/gui/options-dialog.hpp
+++ b/gui/options-dialog.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "ui_options-dialog.h"
-#include "opentrack-logic/shortcuts.h"
+#include "logic/shortcuts.h"
 #include <QObject>
 #include <QWidget>
 #include <functional>
diff --git a/gui/process_detector.cpp b/gui/process_detector.cpp
index 9c12f783..7df8e980 100644
--- a/gui/process_detector.cpp
+++ b/gui/process_detector.cpp
@@ -8,7 +8,7 @@
 
 #include "process_detector.h"
 #include "main-window.hpp"
-#include "opentrack-compat/process-list.hpp"
+#include "compat/process-list.hpp"
 #include <QList>
 #include <QFileDialog>
 #include <QComboBox>
diff --git a/gui/process_detector.h b/gui/process_detector.h
index e395e1a2..e081fa27 100644
--- a/gui/process_detector.h
+++ b/gui/process_detector.h
@@ -13,7 +13,7 @@
 #include <QTableWidget>
 #include <QResizeEvent>
 
-#include "opentrack-compat/options.hpp"
+#include "compat/options.hpp"
 using namespace options;
 
 class FancyTable : public QTableWidget
@@ -47,10 +47,10 @@ struct settings
 class process_detector : public QWidget
 {
     Q_OBJECT
-    
+
     Ui_Dialog ui;
     settings s;
-    
+
     int add_row(QString exe_name = "...", QString profile = "");
     void add_items();
 public: