diff --git a/src/xswiftbus/main.cpp b/src/xswiftbus/main.cpp
index 41d9e6e7b..8caffeeaa 100644
--- a/src/xswiftbus/main.cpp
+++ b/src/xswiftbus/main.cpp
@@ -15,6 +15,8 @@
 #include "traffic.h"
 #include "service.h"
 #include <XPLM/XPLMPlanes.h>
+#include <XPLM/XPLMPlugin.h>
+#include <cstring>
 
 #if ! defined(XPLM210)
 #define XPLM_MSG_LIVERY_LOADED 108
diff --git a/src/xswiftbus/utils.cpp b/src/xswiftbus/utils.cpp
index dfd78cad0..bcec731c4 100644
--- a/src/xswiftbus/utils.cpp
+++ b/src/xswiftbus/utils.cpp
@@ -15,6 +15,7 @@
 
 #include "utils.h"
 #include <XPMPMultiplayerCSL.h>
+#include <XPLM/XPLMUtilities.h>
 #include <string>
 #include <sstream>
 
diff --git a/src/xswiftbus/utils.h b/src/xswiftbus/utils.h
index de4ea0812..9ccf1c426 100644
--- a/src/xswiftbus/utils.h
+++ b/src/xswiftbus/utils.h
@@ -12,166 +12,9 @@
 #ifndef BLACKSIM_XSWIFTBUS_UTILS_H
 #define BLACKSIM_XSWIFTBUS_UTILS_H
 
-#include <XPLM/XPLMDefs.h>
-#include <XPLM/XPLMPlugin.h>
-#include <XPLM/XPLMProcessing.h>
-#include <XPLM/XPLMUtilities.h>
 #include <vector>
-#include <cstring>
-#include <cstdio>
-#include <cstdlib>
-#include <clocale>
 #include <string>
 
-/*!
- * Install a Qt message handler which outputs to the X-Plane debug log.
- */
-//class QXPlaneMessageHandler
-//{
-//    static void handler(QtMsgType type, const QMessageLogContext &context, const QString &msg)
-//    {
-//        QByteArray localMsg = msg.toLocal8Bit();
-//        QByteArray file(context.file);
-//        if (file.isEmpty()) file = "<unknown>";
-
-//        int line = context.line;
-
-//        char *buffer = new char[64 + localMsg.size() + file.size()];
-//        switch (type) {
-//        case QtDebugMsg:
-//            std::sprintf(buffer, "%s:%d: Debug: %s\n", file.constData(), line, localMsg.constData());
-//            XPLMDebugString(buffer);
-//            break;
-//        case QtInfoMsg:
-//            std::sprintf(buffer, "%s:%d: Info: %s\n", file.constData(), line, localMsg.constData());
-//            XPLMDebugString(buffer);
-//            break;
-//        case QtWarningMsg:
-//            std::sprintf(buffer, "%s:%d: Warning: %s\n", file.constData(), line, localMsg.constData());
-//            XPLMDebugString(buffer);
-//            break;
-//        default:
-//        case QtCriticalMsg:
-//            std::sprintf(buffer, "%s:%d: Error: %s\n", file.constData(), line, localMsg.constData());
-//            XPLMDebugString(buffer);
-//            break;
-//        case QtFatalMsg:
-//            std::sprintf(buffer, "%s:%d: Fatal: %s\n", file.constData(), line, localMsg.constData());
-//            XPLMDebugString(buffer);
-//            std::abort();
-//        }
-//        delete[] buffer;
-//    }
-
-//public:
-//    /*!
-//     * Install the handler.
-//     */
-//    static void install()
-//    {
-//        qInstallMessageHandler(handler);
-//    }
-
-//    //! Not copyable.
-//    //! @{
-//    QXPlaneMessageHandler(const QXPlaneMessageHandler &) = delete;
-//    QXPlaneMessageHandler &operator =(const QXPlaneMessageHandler &) = delete;
-//    //! @}
-//};
-
-/*!
- * QApplication subclass used by XSwiftBus.
- *
- * Only one instance of QApplication is allowed per process, so if any other
- * X-Plane plugin, completely unrelated to this pilot client, wants to use the
- * Qt framework, they can simply copy & paste this class into their project
- * and both X-Plane plugins will be able to share a single QApplication safely.
- */
-//class QSharedApplication : public QCoreApplication
-//{
-//    Q_OBJECT
-
-//    QWeakPointer<QCoreApplication> m_weakptr;
-
-//    QSharedApplication(QSharedPointer<QCoreApplication> &ptr, int &argc, char **argv) : QCoreApplication(argc, argv)
-//    {
-//        ptr.reset(this);
-//        m_weakptr = ptr;
-//    }
-
-//    static char *strdup(const char *s) { auto s2 = static_cast<char *>(std::malloc(std::strlen(s) + 1)); return std::strcpy(s2, s); }
-
-//public:
-//    /*!
-//     * Returns a shared pointer to the QApplication.
-//     *
-//     * The QApplication will not be destroyed while this shared pointer exists.
-//     */
-//    static QSharedPointer<QCoreApplication> sharedInstance()
-//    {
-//        QSharedPointer<QCoreApplication> ptr;
-//        if (! instance())
-//        {
-//            static int argc = 1;
-//            static char *argv[] = { strdup("X-Plane") };
-      
-//#ifdef Q_OS_UNIX
-//            /* Workaround for #362 */
-//            char* xplocale = setlocale(LC_ALL, nullptr);
-//#endif
-            
-//            new QSharedApplication(ptr, argc, argv);
-            
-//#ifdef Q_OS_UNIX
-//            setlocale(LC_ALL, xplocale);
-//#endif
-//        }
-//        if (! instance()->inherits("QSharedApplication"))
-//        {
-//            qFatal("There is an unshared QCoreApplication in another plugin");
-//        }
-//        return static_cast<QSharedApplication*>(instance())->m_weakptr;
-//    }
-//};
-
-///*!
-// * Runs the Qt event loop inside the X-Plane event loop.
-// */
-//class QXPlaneEventLoop : public QObject
-//{
-//    Q_OBJECT
-
-//    QXPlaneEventLoop(QObject *parent) : QObject(parent)
-//    {
-//        XPLMRegisterFlightLoopCallback(callback, -1, nullptr);
-//    }
-
-//    ~QXPlaneEventLoop()
-//    {
-//        XPLMUnregisterFlightLoopCallback(callback, nullptr);
-//    }
-
-//    static float callback(float, float, int, void *)
-//    {
-//        QCoreApplication::processEvents();
-//        QCoreApplication::sendPostedEvents();
-//        return -1;
-//    }
-
-//public:
-//    /*!
-//     * Registers the X-Plane callback which calls into the Qt event loop,
-//     * unless one was already registered.
-//     */
-//    static void exec()
-//    {
-//        if (! QCoreApplication::instance()->findChild<QXPlaneEventLoop *>())
-//        {
-//            new QXPlaneEventLoop(QCoreApplication::instance());
-//        }
-//    }
-//};
-
 namespace XSwiftBus
 {
     //! Absolute xplane path