diff --git a/ground/openpilotgcs/src/plugins/coreplugin/coreplugin.cpp b/ground/openpilotgcs/src/plugins/coreplugin/coreplugin.cpp
index 254f07865..6f6492f92 100644
--- a/ground/openpilotgcs/src/plugins/coreplugin/coreplugin.cpp
+++ b/ground/openpilotgcs/src/plugins/coreplugin/coreplugin.cpp
@@ -29,7 +29,7 @@
 #include "coreplugin.h"
 #include "coreimpl.h"
 #include "mainwindow.h"
-
+#include <QtPlugin>
 #include <extensionsystem/pluginmanager.h>
 
 #include <QtCore/QtPlugin>
@@ -78,4 +78,4 @@ void CorePlugin::shutdown()
     m_mainWindow->shutdown();
 }
 
-Q_EXPORT_PLUGIN(CorePlugin)
+Q_EXPORT_PLUGIN2(Core,CorePlugin)
diff --git a/ground/openpilotgcs/src/plugins/coreplugin/generalsettings.h b/ground/openpilotgcs/src/plugins/coreplugin/generalsettings.h
index 6c77ab065..8b41d9b0f 100644
--- a/ground/openpilotgcs/src/plugins/coreplugin/generalsettings.h
+++ b/ground/openpilotgcs/src/plugins/coreplugin/generalsettings.h
@@ -41,7 +41,7 @@ namespace Ui {
     class GeneralSettings;
 }
 
-class GeneralSettings : public IOptionsPage
+class CORE_EXPORT GeneralSettings : public IOptionsPage
 {
     Q_OBJECT