diff --git a/ground/openpilotgcs/src/plugins/pipxtreme/pipxtremegadgetwidget.h b/ground/openpilotgcs/src/plugins/pipxtreme/pipxtremegadgetwidget.h
index 30b573e54..6af22d9fa 100644
--- a/ground/openpilotgcs/src/plugins/pipxtreme/pipxtremegadgetwidget.h
+++ b/ground/openpilotgcs/src/plugins/pipxtreme/pipxtremegadgetwidget.h
@@ -36,6 +36,9 @@
 #include "uavobjects/uavobjectmanager.h"
 #include "uavobjects/uavobject.h"
 
+#include "coreplugin/icore.h"
+#include "coreplugin/connectionmanager.h"
+
 #include "rawhid/rawhidplugin.h"
 
 #include <QtGui/QWidget>
diff --git a/ground/openpilotgcs/src/plugins/uploader/uploadergadgetwidget.h b/ground/openpilotgcs/src/plugins/uploader/uploadergadgetwidget.h
index 07ff77432..c0274668b 100755
--- a/ground/openpilotgcs/src/plugins/uploader/uploadergadgetwidget.h
+++ b/ground/openpilotgcs/src/plugins/uploader/uploadergadgetwidget.h
@@ -1,92 +1,95 @@
-/**
- ******************************************************************************
- *
- * @file       uploadergadgetwidget.h
- * @author     The OpenPilot Team, http://www.openpilot.org Copyright (C) 2010.
- * @addtogroup GCSPlugins GCS Plugins
- * @{
- * @addtogroup YModemUploader YModem Serial Uploader Plugin
- * @{
- * @brief The YModem protocol serial uploader plugin
- *****************************************************************************/
-/*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-#ifndef UPLOADERGADGETWIDGET_H
-#define UPLOADERGADGETWIDGET_H
-
-#include "ui_uploader.h"
-#include "delay.h"
-#include "devicewidget.h"
-#include "op_dfu.h"
-#include <qextserialport.h>
-#include <qextserialenumerator.h>
-
-
-#include "uavtalk/telemetrymanager.h"
-#include "extensionsystem/pluginmanager.h"
-#include "uavobjectmanager.h"
-#include "uavobject.h"
-
-#include "rawhid/rawhidplugin.h"
-#include <QtGui/QWidget>
-#include <QLabel>
-#include <QLineEdit>
-#include <QThread>
-#include <QMessageBox>
-#include <QTimer>
-
-
-using namespace OP_DFU;
-
-class UploaderGadgetWidget : public QWidget
-{
-    Q_OBJECT
-
-public:
-    UploaderGadgetWidget(QWidget *parent = 0);
-   ~UploaderGadgetWidget();
-    typedef enum { IAP_STATE_READY, IAP_STATE_STEP_1, IAP_STATE_STEP_2, IAP_STEP_RESET, IAP_STATE_BOOTLOADER} IAPStep;
-    typedef enum { RESCUE_STEP0, RESCUE_STEP1, RESCUE_STEP2, RESCUE_STEP3, RESCUE_POWER1, RESCUE_POWER2, RESCUE_DETECT } RescueStep;
-    void log(QString str);
-
-public slots:
-    void onAutopilotConnect();
-    void onAutopilotDisconnect();
-
-private:
-     Ui_UploaderWidget *m_config;
-     DFUObject *dfu;
-     IAPStep currentStep;
-     RescueStep rescueStep;
-     bool resetOnly;
-     void clearLog();
-     QString getPortDevice(const QString &friendName);
-
-     QLineEdit* openFileNameLE;
-
-private slots:
-    void error(QString errorString,int errorNumber);
-    void info(QString infoString,int infoNumber);
-    void goToBootloader(UAVObject* = NULL, bool = false);
-    void systemReset();
-    void systemBoot();
-    void systemRescue();
-    void getSerialPorts();
-
-};
-
-#endif // UPLOADERGADGETWIDGET_H
+/**
+ ******************************************************************************
+ *
+ * @file       uploadergadgetwidget.h
+ * @author     The OpenPilot Team, http://www.openpilot.org Copyright (C) 2010.
+ * @addtogroup GCSPlugins GCS Plugins
+ * @{
+ * @addtogroup YModemUploader YModem Serial Uploader Plugin
+ * @{
+ * @brief The YModem protocol serial uploader plugin
+ *****************************************************************************/
+/*
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+#ifndef UPLOADERGADGETWIDGET_H
+#define UPLOADERGADGETWIDGET_H
+
+#include "ui_uploader.h"
+#include "delay.h"
+#include "devicewidget.h"
+#include "op_dfu.h"
+#include <qextserialport.h>
+#include <qextserialenumerator.h>
+
+
+#include "uavtalk/telemetrymanager.h"
+#include "extensionsystem/pluginmanager.h"
+#include "uavobjectmanager.h"
+#include "uavobject.h"
+
+#include "coreplugin/icore.h"
+#include "coreplugin/connectionmanager.h"
+
+#include "rawhid/rawhidplugin.h"
+#include <QtGui/QWidget>
+#include <QLabel>
+#include <QLineEdit>
+#include <QThread>
+#include <QMessageBox>
+#include <QTimer>
+
+
+using namespace OP_DFU;
+
+class UploaderGadgetWidget : public QWidget
+{
+    Q_OBJECT
+
+public:
+    UploaderGadgetWidget(QWidget *parent = 0);
+   ~UploaderGadgetWidget();
+    typedef enum { IAP_STATE_READY, IAP_STATE_STEP_1, IAP_STATE_STEP_2, IAP_STEP_RESET, IAP_STATE_BOOTLOADER} IAPStep;
+    typedef enum { RESCUE_STEP0, RESCUE_STEP1, RESCUE_STEP2, RESCUE_STEP3, RESCUE_POWER1, RESCUE_POWER2, RESCUE_DETECT } RescueStep;
+    void log(QString str);
+
+public slots:
+    void onAutopilotConnect();
+    void onAutopilotDisconnect();
+
+private:
+     Ui_UploaderWidget *m_config;
+     DFUObject *dfu;
+     IAPStep currentStep;
+     RescueStep rescueStep;
+     bool resetOnly;
+     void clearLog();
+     QString getPortDevice(const QString &friendName);
+
+     QLineEdit* openFileNameLE;
+
+private slots:
+    void error(QString errorString,int errorNumber);
+    void info(QString infoString,int infoNumber);
+    void goToBootloader(UAVObject* = NULL, bool = false);
+    void systemReset();
+    void systemBoot();
+    void systemRescue();
+    void getSerialPorts();
+
+};
+
+#endif // UPLOADERGADGETWIDGET_H