diff --git a/ArduPlane/ArduPlane.cpp b/ArduPlane/ArduPlane.cpp
index 1f6d0c6159..1990ca0ed2 100644
--- a/ArduPlane/ArduPlane.cpp
+++ b/ArduPlane/ArduPlane.cpp
@@ -22,6 +22,12 @@
 
 #include "Plane.h"
 
+#define FORCE_VERSION_H_INCLUDE
+#include "version.h"
+#undef FORCE_VERSION_H_INCLUDE
+
+const AP_HAL::HAL& hal = AP_HAL::get_HAL();
+
 #define SCHED_TASK(func, rate_hz, max_time_micros, priority) SCHED_TASK_CLASS(Plane, &plane, func, rate_hz, max_time_micros, priority)
 #define FAST_TASK(func) FAST_TASK_CLASS(Plane, &plane, func)
 
@@ -1049,4 +1055,16 @@ void Plane::update_quicktune(void)
 }
 #endif
 
+/*
+  constructor for main Plane class
+ */
+Plane::Plane(void)
+{
+    // C++11 doesn't allow in-class initialisation of bitfields
+    auto_state.takeoff_complete = true;
+}
+
+Plane plane;
+AP_Vehicle& vehicle = plane;
+
 AP_HAL_MAIN_CALLBACKS(&plane);
diff --git a/ArduPlane/Plane.cpp b/ArduPlane/Plane.cpp
deleted file mode 100644
index 4be3c0df7c..0000000000
--- a/ArduPlane/Plane.cpp
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
-   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, see <http://www.gnu.org/licenses/>.
- */
-#include "Plane.h"
-
-#define FORCE_VERSION_H_INCLUDE
-#include "version.h"
-#undef FORCE_VERSION_H_INCLUDE
-
-const AP_HAL::HAL& hal = AP_HAL::get_HAL();
-
-/*
-  constructor for main Plane class
- */
-Plane::Plane(void)
-{
-    // C++11 doesn't allow in-class initialisation of bitfields
-    auto_state.takeoff_complete = true;
-}
-
-Plane plane;
-AP_Vehicle& vehicle = plane;