diff --git a/src/lib/FlightTasks/CMakeLists.txt b/src/lib/FlightTasks/CMakeLists.txt
index bd4a4724e7..95b356f97e 100644
--- a/src/lib/FlightTasks/CMakeLists.txt
+++ b/src/lib/FlightTasks/CMakeLists.txt
@@ -33,7 +33,7 @@
 px4_add_module(
 	MODULE lib__flight_tasks
 	SRCS
-		FlightTask.h
+		tasks/FlightTask.cpp
 		tasks/FlightTaskManual.cpp
 		tasks/FlightTaskOrbit.cpp
 	DEPENDS
diff --git a/src/lib/FlightTasks/tasks/FlightTask.cpp b/src/lib/FlightTasks/tasks/FlightTask.cpp
new file mode 100644
index 0000000000..c91d2e59a3
--- /dev/null
+++ b/src/lib/FlightTasks/tasks/FlightTask.cpp
@@ -0,0 +1,45 @@
+#include "FlightTask.hpp"
+#include <mathlib/mathlib.h>
+
+int FlightTask::update()
+{
+	_time = hrt_elapsed_time(&_starting_time_stamp) / 1e6f;
+	_deltatime  = math::min((int)hrt_elapsed_time(&_last_time_stamp), _timeout) / 1e6f;
+	_last_time_stamp = hrt_absolute_time();
+	updateSubscriptions();
+	_evaluate_vehicle_position();
+	return 0;
+}
+
+void FlightTask::_evaluate_vehicle_position()
+{
+	if (hrt_elapsed_time(&_sub_vehicle_local_position.get().timestamp) < _timeout) {
+		_position = matrix::Vector3f(&_sub_vehicle_local_position.get().x);
+		_velocity = matrix::Vector3f(&_sub_vehicle_local_position.get().vx);
+		_yaw = _sub_vehicle_local_position.get().yaw;
+
+	} else {
+		_velocity.zero(); /* default velocity is all zero */
+	}
+}
+
+void FlightTask::_set_position_setpoint(const matrix::Vector3f position_setpoint)
+{
+	_vehicle_local_position_setpoint.x = position_setpoint(0);
+	_vehicle_local_position_setpoint.y = position_setpoint(1);
+	_vehicle_local_position_setpoint.z = position_setpoint(2);
+}
+
+void FlightTask::_set_velocity_setpoint(const matrix::Vector3f velocity_setpoint)
+{
+	_vehicle_local_position_setpoint.vx = velocity_setpoint(0);
+	_vehicle_local_position_setpoint.vy = velocity_setpoint(1);
+	_vehicle_local_position_setpoint.vz = velocity_setpoint(2);
+}
+
+void FlightTask::_set_acceleration_setpoint(const matrix::Vector3f acceleration_setpoint)
+{
+	_vehicle_local_position_setpoint.acc_x = acceleration_setpoint(0);
+	_vehicle_local_position_setpoint.acc_y = acceleration_setpoint(1);
+	_vehicle_local_position_setpoint.acc_z = acceleration_setpoint(2);
+}
diff --git a/src/lib/FlightTasks/tasks/FlightTask.hpp b/src/lib/FlightTasks/tasks/FlightTask.hpp
index 5b23a1a1d8..2b62e6375f 100644
--- a/src/lib/FlightTasks/tasks/FlightTask.hpp
+++ b/src/lib/FlightTasks/tasks/FlightTask.hpp
@@ -41,7 +41,12 @@
 
 #pragma once
 
+#include <controllib/blocks.hpp>
+#include <drivers/drv_hrt.h>
 #include <matrix/matrix/math.hpp>
+#include <uORB/topics/vehicle_local_position.h>
+#include <uORB/topics/vehicle_local_position_setpoint.h>
+
 
 class FlightTask : public control::SuperBlock
 {
@@ -54,7 +59,6 @@ public:
 
 	/**
 	 * Call once on the event where you switch to the task
-	 * Note: Set the necessary input and output pointers first!
 	 * @return 0 on success, >0 on error
 	 */
 	virtual int activate()
@@ -66,7 +70,7 @@ public:
 
 	/**
 	 * Call once on the event of switching away from the task
-	 * 	@return 0 on success, >0 on error
+	 * @return 0 on success, >0 on error
 	 */
 	virtual int disable() { return 0; };
 
@@ -74,15 +78,7 @@ public:
 	 * To be called regularly in the control loop cycle to execute the task
 	 * @return 0 on success, >0 on error
 	 */
-	virtual int update()
-	{
-		_time = hrt_elapsed_time(&_starting_time_stamp) / 1e6f;
-		_deltatime  = math::min((int)hrt_elapsed_time(&_last_time_stamp), _timeout) / 1e6f;
-		_last_time_stamp = hrt_absolute_time();
-		updateSubscriptions();
-		_evaluate_vehicle_position();
-		return 0;
-	};
+	virtual int update();
 
 	/**
 	 * Get the output data
@@ -106,32 +102,17 @@ protected:
 	/**
 	 * Put the position vector produced by the task into the setpoint message
 	 */
-	void _set_position_setpoint(const matrix::Vector3f position_setpoint)
-	{
-		_vehicle_local_position_setpoint.x = position_setpoint(0);
-		_vehicle_local_position_setpoint.y = position_setpoint(1);
-		_vehicle_local_position_setpoint.z = position_setpoint(2);
-	};
+	void _set_position_setpoint(const matrix::Vector3f position_setpoint);
 
 	/**
 	 * Put the velocity vector produced by the task into the setpoint message
 	 */
-	void _set_velocity_setpoint(const matrix::Vector3f velocity_setpoint)
-	{
-		_vehicle_local_position_setpoint.vx = velocity_setpoint(0);
-		_vehicle_local_position_setpoint.vy = velocity_setpoint(1);
-		_vehicle_local_position_setpoint.vz = velocity_setpoint(2);
-	};
+	void _set_velocity_setpoint(const matrix::Vector3f velocity_setpoint);
 
 	/**
 	 * Put the acceleration vector produced by the task into the setpoint message
 	 */
-	void _set_acceleration_setpoint(const matrix::Vector3f acceleration_setpoint)
-	{
-		_vehicle_local_position_setpoint.acc_x = acceleration_setpoint(0);
-		_vehicle_local_position_setpoint.acc_y = acceleration_setpoint(1);
-		_vehicle_local_position_setpoint.acc_z = acceleration_setpoint(2);
-	};
+	void _set_acceleration_setpoint(const matrix::Vector3f acceleration_setpoint);
 
 	/**
 	 * Put the yaw angle produced by the task into the setpoint message
@@ -147,15 +128,5 @@ private:
 	/* Output position setpoint that every task has */
 	vehicle_local_position_setpoint_s _vehicle_local_position_setpoint;
 
-	void _evaluate_vehicle_position()
-	{
-		if (hrt_elapsed_time(&_sub_vehicle_local_position.get().timestamp) < _timeout) {
-			_position = matrix::Vector3f(&_sub_vehicle_local_position.get().x);
-			_velocity = matrix::Vector3f(&_sub_vehicle_local_position.get().vx);
-			_yaw = _sub_vehicle_local_position.get().yaw;
-
-		} else {
-			_velocity.zero(); /* default velocity is all zero */
-		}
-	}
+	void _evaluate_vehicle_position();
 };
diff --git a/src/lib/FlightTasks/tasks/FlightTaskManual.cpp b/src/lib/FlightTasks/tasks/FlightTaskManual.cpp
index 686e7dc5b0..f6785395e7 100644
--- a/src/lib/FlightTasks/tasks/FlightTaskManual.cpp
+++ b/src/lib/FlightTasks/tasks/FlightTaskManual.cpp
@@ -41,6 +41,7 @@
  */
 
 #include "FlightTaskManual.hpp"
+#include <float.h>
 #include <mathlib/mathlib.h>
 
 using namespace matrix;
diff --git a/src/lib/FlightTasks/tasks/FlightTaskManual.hpp b/src/lib/FlightTasks/tasks/FlightTaskManual.hpp
index 9ec915fc43..eb58d5ec91 100644
--- a/src/lib/FlightTasks/tasks/FlightTaskManual.hpp
+++ b/src/lib/FlightTasks/tasks/FlightTaskManual.hpp
@@ -44,6 +44,8 @@
 
 #include "FlightTask.hpp"
 #include <mathlib/math/filter/LowPassFilter2p.hpp>
+#include <systemlib/hysteresis/hysteresis.h>
+#include <uORB/topics/manual_control_setpoint.h>
 
 class FlightTaskManual : public FlightTask
 {
@@ -76,6 +78,9 @@ public:
 	};
 	virtual ~FlightTaskManual() {};
 
+	int activate() override;
+	int disable() override;
+	int update() override;
 
 protected:
 	matrix::Vector<float, 4> _sticks;
diff --git a/src/lib/FlightTasks/tasks/FlightTaskOrbit.cpp b/src/lib/FlightTasks/tasks/FlightTaskOrbit.cpp
index 33e6521ce0..344d496000 100644
--- a/src/lib/FlightTasks/tasks/FlightTaskOrbit.cpp
+++ b/src/lib/FlightTasks/tasks/FlightTaskOrbit.cpp
@@ -41,6 +41,7 @@
  */
 
 #include "FlightTaskOrbit.hpp"
+#include <mathlib/mathlib.h>
 
 using namespace matrix;
 
diff --git a/src/lib/FlightTasks/tasks/FlightTaskOrbit.hpp b/src/lib/FlightTasks/tasks/FlightTaskOrbit.hpp
index 21d7d67745..a00c5962e4 100644
--- a/src/lib/FlightTasks/tasks/FlightTaskOrbit.hpp
+++ b/src/lib/FlightTasks/tasks/FlightTaskOrbit.hpp
@@ -51,6 +51,10 @@ public:
 	{};
 	virtual ~FlightTaskOrbit() {};
 
+	int activate() override;
+	int disable() override;
+	int update() override;
+
 private:
 
 	float r = 0.f; /* radius with which to orbit the target */