diff --git a/Makefile b/Makefile
index fdf2f8f4e6f5dd6ad3dda8ef92911dbeef74808e..4edc593b5951970cda7c6c402b8c6290afc003bd 100644
--- a/Makefile
+++ b/Makefile
@@ -51,7 +51,6 @@ SUBDIR+=	libhatp
 SUBDIR+=	libmove3d
 SUBDIR+=	libmove3d-hri
 SUBDIR+=	libmove3d-planners
-SUBDIR+=	mavlink
 SUBDIR+=	metapod
 SUBDIR+=	morse-ros
 SUBDIR+=	move3d-assets
diff --git a/mavlink/DESCR b/mavlink/DESCR
deleted file mode 100644
index 95b4a10e22644cef8cd5d190fa5540c3d52f03b9..0000000000000000000000000000000000000000
--- a/mavlink/DESCR
+++ /dev/null
@@ -1,8 +0,0 @@
-MAVLink -- Micro Air Vehicle Message Marshalling Library.
-
-This is a library for lightweight communication between Micro Air Vehicles
-(swarm) and/or ground control stations. It serializes C-structs for serial
-channels and can be used with any type of radio modem.
-
-Messages definitions are created in XML, and then converted into C header
-files.
diff --git a/mavlink/Makefile b/mavlink/Makefile
deleted file mode 100644
index 49a2681d6dcf95df188c0e8bb46959d4705c5f02..0000000000000000000000000000000000000000
--- a/mavlink/Makefile
+++ /dev/null
@@ -1,30 +0,0 @@
-# robotpkg Makefile for:	supervision/hyper
-# Created:			Arnaud Degroote on Mon,  8 Oct 2012
-#
-
-DISTNAME= 		mavlink-${VERSION}
-VERSION=		20150929
-CATEGORIES=		middleware
-
-COMMIT= 			9fff38f4561b7a6ff32ee71d41e67cf956e541bd
-FETCH_METHOD= 		git
-MASTER_SITES=		https://github.com/mavlink/mavlink.git@${COMMIT}
-MASTER_REPOSITORY=	https://github.com/mavlink/mavlink.git
-
-MAINTAINER=		arnaud.degroote@isae-supaero.fr
-COMMENT=		MAVLink -- Micro Air Vehicle Message Marshalling Library
-LICENSE=		gnu-lgpl-v3
-
-WRKSRC= 		${WRKDIR}/mavlink-${VERSION}
-
-CMAKE_ARG_PATH=		..
-CONFIGURE_DIRS=		_build
-
-pre-configure:
-	mkdir ${WRKSRC}/${CONFIGURE_DIRS}
-
-include ../../mk/sysdep/cmake.mk
-include ../../mk/language/c.mk
-include ../../mk/language/c++.mk
-include ../../mk/sysdep/python.mk
-include ../../mk/robotpkg.mk
diff --git a/mavlink/PLIST b/mavlink/PLIST
deleted file mode 100644
index 3f54ab9a1ccbf0f0a753b2c6aa8120ec9fa6553d..0000000000000000000000000000000000000000
--- a/mavlink/PLIST
+++ /dev/null
@@ -1,448 +0,0 @@
-@comment Tue Sep 29 14:39:50 CEST 2015
-include/mavlink/config.h
-include/mavlink/v0.9/ardupilotmega/ardupilotmega.h
-include/mavlink/v0.9/ardupilotmega/mavlink.h
-include/mavlink/v0.9/ardupilotmega/mavlink_msg_ahrs.h
-include/mavlink/v0.9/ardupilotmega/mavlink_msg_ap_adc.h
-include/mavlink/v0.9/ardupilotmega/mavlink_msg_digicam_configure.h
-include/mavlink/v0.9/ardupilotmega/mavlink_msg_digicam_control.h
-include/mavlink/v0.9/ardupilotmega/mavlink_msg_fence_fetch_point.h
-include/mavlink/v0.9/ardupilotmega/mavlink_msg_fence_point.h
-include/mavlink/v0.9/ardupilotmega/mavlink_msg_fence_status.h
-include/mavlink/v0.9/ardupilotmega/mavlink_msg_hwstatus.h
-include/mavlink/v0.9/ardupilotmega/mavlink_msg_meminfo.h
-include/mavlink/v0.9/ardupilotmega/mavlink_msg_mount_configure.h
-include/mavlink/v0.9/ardupilotmega/mavlink_msg_mount_control.h
-include/mavlink/v0.9/ardupilotmega/mavlink_msg_mount_status.h
-include/mavlink/v0.9/ardupilotmega/mavlink_msg_radio.h
-include/mavlink/v0.9/ardupilotmega/mavlink_msg_sensor_offsets.h
-include/mavlink/v0.9/ardupilotmega/mavlink_msg_set_mag_offsets.h
-include/mavlink/v0.9/ardupilotmega/mavlink_msg_simstate.h
-include/mavlink/v0.9/ardupilotmega/testsuite.h
-include/mavlink/v0.9/ardupilotmega/version.h
-include/mavlink/v0.9/checksum.h
-include/mavlink/v0.9/common/common.h
-include/mavlink/v0.9/common/mavlink.h
-include/mavlink/v0.9/common/mavlink_msg_action.h
-include/mavlink/v0.9/common/mavlink_msg_action_ack.h
-include/mavlink/v0.9/common/mavlink_msg_attitude.h
-include/mavlink/v0.9/common/mavlink_msg_auth_key.h
-include/mavlink/v0.9/common/mavlink_msg_boot.h
-include/mavlink/v0.9/common/mavlink_msg_change_operator_control.h
-include/mavlink/v0.9/common/mavlink_msg_change_operator_control_ack.h
-include/mavlink/v0.9/common/mavlink_msg_command.h
-include/mavlink/v0.9/common/mavlink_msg_command_ack.h
-include/mavlink/v0.9/common/mavlink_msg_control_status.h
-include/mavlink/v0.9/common/mavlink_msg_debug.h
-include/mavlink/v0.9/common/mavlink_msg_debug_vect.h
-include/mavlink/v0.9/common/mavlink_msg_global_position.h
-include/mavlink/v0.9/common/mavlink_msg_global_position_int.h
-include/mavlink/v0.9/common/mavlink_msg_gps_local_origin_set.h
-include/mavlink/v0.9/common/mavlink_msg_gps_raw.h
-include/mavlink/v0.9/common/mavlink_msg_gps_raw_int.h
-include/mavlink/v0.9/common/mavlink_msg_gps_set_global_origin.h
-include/mavlink/v0.9/common/mavlink_msg_gps_status.h
-include/mavlink/v0.9/common/mavlink_msg_heartbeat.h
-include/mavlink/v0.9/common/mavlink_msg_hil_controls.h
-include/mavlink/v0.9/common/mavlink_msg_hil_state.h
-include/mavlink/v0.9/common/mavlink_msg_local_position.h
-include/mavlink/v0.9/common/mavlink_msg_local_position_setpoint.h
-include/mavlink/v0.9/common/mavlink_msg_local_position_setpoint_set.h
-include/mavlink/v0.9/common/mavlink_msg_manual_control.h
-include/mavlink/v0.9/common/mavlink_msg_named_value_float.h
-include/mavlink/v0.9/common/mavlink_msg_named_value_int.h
-include/mavlink/v0.9/common/mavlink_msg_nav_controller_output.h
-include/mavlink/v0.9/common/mavlink_msg_object_detection_event.h
-include/mavlink/v0.9/common/mavlink_msg_optical_flow.h
-include/mavlink/v0.9/common/mavlink_msg_param_request_list.h
-include/mavlink/v0.9/common/mavlink_msg_param_request_read.h
-include/mavlink/v0.9/common/mavlink_msg_param_set.h
-include/mavlink/v0.9/common/mavlink_msg_param_value.h
-include/mavlink/v0.9/common/mavlink_msg_ping.h
-include/mavlink/v0.9/common/mavlink_msg_position_target.h
-include/mavlink/v0.9/common/mavlink_msg_raw_imu.h
-include/mavlink/v0.9/common/mavlink_msg_raw_pressure.h
-include/mavlink/v0.9/common/mavlink_msg_rc_channels_override.h
-include/mavlink/v0.9/common/mavlink_msg_rc_channels_raw.h
-include/mavlink/v0.9/common/mavlink_msg_rc_channels_scaled.h
-include/mavlink/v0.9/common/mavlink_msg_request_data_stream.h
-include/mavlink/v0.9/common/mavlink_msg_roll_pitch_yaw_speed_thrust_setpoint.h
-include/mavlink/v0.9/common/mavlink_msg_roll_pitch_yaw_thrust_setpoint.h
-include/mavlink/v0.9/common/mavlink_msg_safety_allowed_area.h
-include/mavlink/v0.9/common/mavlink_msg_safety_set_allowed_area.h
-include/mavlink/v0.9/common/mavlink_msg_scaled_imu.h
-include/mavlink/v0.9/common/mavlink_msg_scaled_pressure.h
-include/mavlink/v0.9/common/mavlink_msg_servo_output_raw.h
-include/mavlink/v0.9/common/mavlink_msg_set_altitude.h
-include/mavlink/v0.9/common/mavlink_msg_set_mode.h
-include/mavlink/v0.9/common/mavlink_msg_set_nav_mode.h
-include/mavlink/v0.9/common/mavlink_msg_set_roll_pitch_yaw_speed_thrust.h
-include/mavlink/v0.9/common/mavlink_msg_set_roll_pitch_yaw_thrust.h
-include/mavlink/v0.9/common/mavlink_msg_state_correction.h
-include/mavlink/v0.9/common/mavlink_msg_statustext.h
-include/mavlink/v0.9/common/mavlink_msg_sys_status.h
-include/mavlink/v0.9/common/mavlink_msg_system_time.h
-include/mavlink/v0.9/common/mavlink_msg_system_time_utc.h
-include/mavlink/v0.9/common/mavlink_msg_vfr_hud.h
-include/mavlink/v0.9/common/mavlink_msg_waypoint.h
-include/mavlink/v0.9/common/mavlink_msg_waypoint_ack.h
-include/mavlink/v0.9/common/mavlink_msg_waypoint_clear_all.h
-include/mavlink/v0.9/common/mavlink_msg_waypoint_count.h
-include/mavlink/v0.9/common/mavlink_msg_waypoint_current.h
-include/mavlink/v0.9/common/mavlink_msg_waypoint_reached.h
-include/mavlink/v0.9/common/mavlink_msg_waypoint_request.h
-include/mavlink/v0.9/common/mavlink_msg_waypoint_request_list.h
-include/mavlink/v0.9/common/mavlink_msg_waypoint_set_current.h
-include/mavlink/v0.9/common/testsuite.h
-include/mavlink/v0.9/common/version.h
-include/mavlink/v0.9/mavlink_helpers.h
-include/mavlink/v0.9/mavlink_types.h
-include/mavlink/v0.9/minimal/mavlink.h
-include/mavlink/v0.9/minimal/mavlink_msg_heartbeat.h
-include/mavlink/v0.9/minimal/minimal.h
-include/mavlink/v0.9/minimal/testsuite.h
-include/mavlink/v0.9/minimal/version.h
-include/mavlink/v0.9/pixhawk/mavlink.h
-include/mavlink/v0.9/pixhawk/mavlink_msg_attitude_control.h
-include/mavlink/v0.9/pixhawk/mavlink_msg_brief_feature.h
-include/mavlink/v0.9/pixhawk/mavlink_msg_data_transmission_handshake.h
-include/mavlink/v0.9/pixhawk/mavlink_msg_encapsulated_data.h
-include/mavlink/v0.9/pixhawk/mavlink_msg_image_available.h
-include/mavlink/v0.9/pixhawk/mavlink_msg_image_trigger_control.h
-include/mavlink/v0.9/pixhawk/mavlink_msg_image_triggered.h
-include/mavlink/v0.9/pixhawk/mavlink_msg_marker.h
-include/mavlink/v0.9/pixhawk/mavlink_msg_pattern_detected.h
-include/mavlink/v0.9/pixhawk/mavlink_msg_point_of_interest.h
-include/mavlink/v0.9/pixhawk/mavlink_msg_point_of_interest_connection.h
-include/mavlink/v0.9/pixhawk/mavlink_msg_position_control_offset_set.h
-include/mavlink/v0.9/pixhawk/mavlink_msg_position_control_setpoint.h
-include/mavlink/v0.9/pixhawk/mavlink_msg_position_control_setpoint_set.h
-include/mavlink/v0.9/pixhawk/mavlink_msg_raw_aux.h
-include/mavlink/v0.9/pixhawk/mavlink_msg_set_cam_shutter.h
-include/mavlink/v0.9/pixhawk/mavlink_msg_vicon_position_estimate.h
-include/mavlink/v0.9/pixhawk/mavlink_msg_vision_position_estimate.h
-include/mavlink/v0.9/pixhawk/mavlink_msg_vision_speed_estimate.h
-include/mavlink/v0.9/pixhawk/mavlink_msg_watchdog_command.h
-include/mavlink/v0.9/pixhawk/mavlink_msg_watchdog_heartbeat.h
-include/mavlink/v0.9/pixhawk/mavlink_msg_watchdog_process_info.h
-include/mavlink/v0.9/pixhawk/mavlink_msg_watchdog_process_status.h
-include/mavlink/v0.9/pixhawk/pixhawk.h
-include/mavlink/v0.9/pixhawk/testsuite.h
-include/mavlink/v0.9/pixhawk/version.h
-include/mavlink/v0.9/protocol.h
-include/mavlink/v0.9/slugs/mavlink.h
-include/mavlink/v0.9/slugs/mavlink_msg_air_data.h
-include/mavlink/v0.9/slugs/mavlink_msg_cpu_load.h
-include/mavlink/v0.9/slugs/mavlink_msg_ctrl_srfc_pt.h
-include/mavlink/v0.9/slugs/mavlink_msg_data_log.h
-include/mavlink/v0.9/slugs/mavlink_msg_diagnostic.h
-include/mavlink/v0.9/slugs/mavlink_msg_gps_date_time.h
-include/mavlink/v0.9/slugs/mavlink_msg_mid_lvl_cmds.h
-include/mavlink/v0.9/slugs/mavlink_msg_sensor_bias.h
-include/mavlink/v0.9/slugs/mavlink_msg_slugs_action.h
-include/mavlink/v0.9/slugs/mavlink_msg_slugs_navigation.h
-include/mavlink/v0.9/slugs/slugs.h
-include/mavlink/v0.9/slugs/testsuite.h
-include/mavlink/v0.9/slugs/version.h
-include/mavlink/v0.9/test/mavlink.h
-include/mavlink/v0.9/test/mavlink_msg_test_types.h
-include/mavlink/v0.9/test/test.h
-include/mavlink/v0.9/test/testsuite.h
-include/mavlink/v0.9/test/version.h
-include/mavlink/v0.9/ualberta/mavlink.h
-include/mavlink/v0.9/ualberta/mavlink_msg_nav_filter_bias.h
-include/mavlink/v0.9/ualberta/mavlink_msg_radio_calibration.h
-include/mavlink/v0.9/ualberta/mavlink_msg_ualberta_sys_status.h
-include/mavlink/v0.9/ualberta/testsuite.h
-include/mavlink/v0.9/ualberta/ualberta.h
-include/mavlink/v0.9/ualberta/version.h
-include/mavlink/v1.0/ardupilotmega/ardupilotmega.h
-include/mavlink/v1.0/ardupilotmega/mavlink.h
-include/mavlink/v1.0/ardupilotmega/mavlink_msg_ahrs.h
-include/mavlink/v1.0/ardupilotmega/mavlink_msg_ahrs2.h
-include/mavlink/v1.0/ardupilotmega/mavlink_msg_ahrs3.h
-include/mavlink/v1.0/ardupilotmega/mavlink_msg_airspeed_autocal.h
-include/mavlink/v1.0/ardupilotmega/mavlink_msg_ap_adc.h
-include/mavlink/v1.0/ardupilotmega/mavlink_msg_autopilot_version_request.h
-include/mavlink/v1.0/ardupilotmega/mavlink_msg_battery2.h
-include/mavlink/v1.0/ardupilotmega/mavlink_msg_camera_feedback.h
-include/mavlink/v1.0/ardupilotmega/mavlink_msg_camera_status.h
-include/mavlink/v1.0/ardupilotmega/mavlink_msg_compassmot_status.h
-include/mavlink/v1.0/ardupilotmega/mavlink_msg_data16.h
-include/mavlink/v1.0/ardupilotmega/mavlink_msg_data32.h
-include/mavlink/v1.0/ardupilotmega/mavlink_msg_data64.h
-include/mavlink/v1.0/ardupilotmega/mavlink_msg_data96.h
-include/mavlink/v1.0/ardupilotmega/mavlink_msg_digicam_configure.h
-include/mavlink/v1.0/ardupilotmega/mavlink_msg_digicam_control.h
-include/mavlink/v1.0/ardupilotmega/mavlink_msg_ekf_status_report.h
-include/mavlink/v1.0/ardupilotmega/mavlink_msg_fence_fetch_point.h
-include/mavlink/v1.0/ardupilotmega/mavlink_msg_fence_point.h
-include/mavlink/v1.0/ardupilotmega/mavlink_msg_fence_status.h
-include/mavlink/v1.0/ardupilotmega/mavlink_msg_gimbal_axis_calibration_progress.h
-include/mavlink/v1.0/ardupilotmega/mavlink_msg_gimbal_control.h
-include/mavlink/v1.0/ardupilotmega/mavlink_msg_gimbal_erase_firmware_and_config.h
-include/mavlink/v1.0/ardupilotmega/mavlink_msg_gimbal_factory_parameters_loaded.h
-include/mavlink/v1.0/ardupilotmega/mavlink_msg_gimbal_home_offset_calibration_result.h
-include/mavlink/v1.0/ardupilotmega/mavlink_msg_gimbal_perform_factory_tests.h
-include/mavlink/v1.0/ardupilotmega/mavlink_msg_gimbal_report.h
-include/mavlink/v1.0/ardupilotmega/mavlink_msg_gimbal_report_factory_tests_progress.h
-include/mavlink/v1.0/ardupilotmega/mavlink_msg_gimbal_reset.h
-include/mavlink/v1.0/ardupilotmega/mavlink_msg_gimbal_set_factory_parameters.h
-include/mavlink/v1.0/ardupilotmega/mavlink_msg_gimbal_set_home_offsets.h
-include/mavlink/v1.0/ardupilotmega/mavlink_msg_gopro_command.h
-include/mavlink/v1.0/ardupilotmega/mavlink_msg_gopro_power_off.h
-include/mavlink/v1.0/ardupilotmega/mavlink_msg_gopro_power_on.h
-include/mavlink/v1.0/ardupilotmega/mavlink_msg_gopro_response.h
-include/mavlink/v1.0/ardupilotmega/mavlink_msg_hwstatus.h
-include/mavlink/v1.0/ardupilotmega/mavlink_msg_led_control.h
-include/mavlink/v1.0/ardupilotmega/mavlink_msg_limits_status.h
-include/mavlink/v1.0/ardupilotmega/mavlink_msg_mag_cal_progress.h
-include/mavlink/v1.0/ardupilotmega/mavlink_msg_mag_cal_report.h
-include/mavlink/v1.0/ardupilotmega/mavlink_msg_meminfo.h
-include/mavlink/v1.0/ardupilotmega/mavlink_msg_mount_configure.h
-include/mavlink/v1.0/ardupilotmega/mavlink_msg_mount_control.h
-include/mavlink/v1.0/ardupilotmega/mavlink_msg_mount_status.h
-include/mavlink/v1.0/ardupilotmega/mavlink_msg_pid_tuning.h
-include/mavlink/v1.0/ardupilotmega/mavlink_msg_radio.h
-include/mavlink/v1.0/ardupilotmega/mavlink_msg_rally_fetch_point.h
-include/mavlink/v1.0/ardupilotmega/mavlink_msg_rally_point.h
-include/mavlink/v1.0/ardupilotmega/mavlink_msg_rangefinder.h
-include/mavlink/v1.0/ardupilotmega/mavlink_msg_rpm.h
-include/mavlink/v1.0/ardupilotmega/mavlink_msg_sensor_offsets.h
-include/mavlink/v1.0/ardupilotmega/mavlink_msg_set_mag_offsets.h
-include/mavlink/v1.0/ardupilotmega/mavlink_msg_simstate.h
-include/mavlink/v1.0/ardupilotmega/mavlink_msg_wind.h
-include/mavlink/v1.0/ardupilotmega/testsuite.h
-include/mavlink/v1.0/ardupilotmega/version.h
-include/mavlink/v1.0/autoquad/autoquad.h
-include/mavlink/v1.0/autoquad/mavlink.h
-include/mavlink/v1.0/autoquad/mavlink_msg_aq_esc_telemetry.h
-include/mavlink/v1.0/autoquad/mavlink_msg_aq_telemetry_f.h
-include/mavlink/v1.0/autoquad/testsuite.h
-include/mavlink/v1.0/autoquad/version.h
-include/mavlink/v1.0/checksum.h
-include/mavlink/v1.0/common/common.h
-include/mavlink/v1.0/common/mavlink.h
-include/mavlink/v1.0/common/mavlink_msg_actuator_control_target.h
-include/mavlink/v1.0/common/mavlink_msg_altitude.h
-include/mavlink/v1.0/common/mavlink_msg_att_pos_mocap.h
-include/mavlink/v1.0/common/mavlink_msg_attitude.h
-include/mavlink/v1.0/common/mavlink_msg_attitude_quaternion.h
-include/mavlink/v1.0/common/mavlink_msg_attitude_quaternion_cov.h
-include/mavlink/v1.0/common/mavlink_msg_attitude_target.h
-include/mavlink/v1.0/common/mavlink_msg_auth_key.h
-include/mavlink/v1.0/common/mavlink_msg_autopilot_version.h
-include/mavlink/v1.0/common/mavlink_msg_battery_status.h
-include/mavlink/v1.0/common/mavlink_msg_camera_trigger.h
-include/mavlink/v1.0/common/mavlink_msg_change_operator_control.h
-include/mavlink/v1.0/common/mavlink_msg_change_operator_control_ack.h
-include/mavlink/v1.0/common/mavlink_msg_command_ack.h
-include/mavlink/v1.0/common/mavlink_msg_command_int.h
-include/mavlink/v1.0/common/mavlink_msg_command_long.h
-include/mavlink/v1.0/common/mavlink_msg_control_system_state.h
-include/mavlink/v1.0/common/mavlink_msg_data_stream.h
-include/mavlink/v1.0/common/mavlink_msg_data_transmission_handshake.h
-include/mavlink/v1.0/common/mavlink_msg_debug.h
-include/mavlink/v1.0/common/mavlink_msg_debug_vect.h
-include/mavlink/v1.0/common/mavlink_msg_distance_sensor.h
-include/mavlink/v1.0/common/mavlink_msg_encapsulated_data.h
-include/mavlink/v1.0/common/mavlink_msg_file_transfer_protocol.h
-include/mavlink/v1.0/common/mavlink_msg_global_position_int.h
-include/mavlink/v1.0/common/mavlink_msg_global_position_int_cov.h
-include/mavlink/v1.0/common/mavlink_msg_global_vision_position_estimate.h
-include/mavlink/v1.0/common/mavlink_msg_gps2_raw.h
-include/mavlink/v1.0/common/mavlink_msg_gps2_rtk.h
-include/mavlink/v1.0/common/mavlink_msg_gps_global_origin.h
-include/mavlink/v1.0/common/mavlink_msg_gps_inject_data.h
-include/mavlink/v1.0/common/mavlink_msg_gps_raw_int.h
-include/mavlink/v1.0/common/mavlink_msg_gps_rtk.h
-include/mavlink/v1.0/common/mavlink_msg_gps_status.h
-include/mavlink/v1.0/common/mavlink_msg_heartbeat.h
-include/mavlink/v1.0/common/mavlink_msg_highres_imu.h
-include/mavlink/v1.0/common/mavlink_msg_hil_controls.h
-include/mavlink/v1.0/common/mavlink_msg_hil_gps.h
-include/mavlink/v1.0/common/mavlink_msg_hil_optical_flow.h
-include/mavlink/v1.0/common/mavlink_msg_hil_rc_inputs_raw.h
-include/mavlink/v1.0/common/mavlink_msg_hil_sensor.h
-include/mavlink/v1.0/common/mavlink_msg_hil_state.h
-include/mavlink/v1.0/common/mavlink_msg_hil_state_quaternion.h
-include/mavlink/v1.0/common/mavlink_msg_home_position.h
-include/mavlink/v1.0/common/mavlink_msg_landing_target.h
-include/mavlink/v1.0/common/mavlink_msg_local_position_ned.h
-include/mavlink/v1.0/common/mavlink_msg_local_position_ned_cov.h
-include/mavlink/v1.0/common/mavlink_msg_local_position_ned_system_global_offset.h
-include/mavlink/v1.0/common/mavlink_msg_log_data.h
-include/mavlink/v1.0/common/mavlink_msg_log_entry.h
-include/mavlink/v1.0/common/mavlink_msg_log_erase.h
-include/mavlink/v1.0/common/mavlink_msg_log_request_data.h
-include/mavlink/v1.0/common/mavlink_msg_log_request_end.h
-include/mavlink/v1.0/common/mavlink_msg_log_request_list.h
-include/mavlink/v1.0/common/mavlink_msg_manual_control.h
-include/mavlink/v1.0/common/mavlink_msg_manual_setpoint.h
-include/mavlink/v1.0/common/mavlink_msg_memory_vect.h
-include/mavlink/v1.0/common/mavlink_msg_message_interval.h
-include/mavlink/v1.0/common/mavlink_msg_mission_ack.h
-include/mavlink/v1.0/common/mavlink_msg_mission_clear_all.h
-include/mavlink/v1.0/common/mavlink_msg_mission_count.h
-include/mavlink/v1.0/common/mavlink_msg_mission_current.h
-include/mavlink/v1.0/common/mavlink_msg_mission_item.h
-include/mavlink/v1.0/common/mavlink_msg_mission_item_int.h
-include/mavlink/v1.0/common/mavlink_msg_mission_item_reached.h
-include/mavlink/v1.0/common/mavlink_msg_mission_request.h
-include/mavlink/v1.0/common/mavlink_msg_mission_request_list.h
-include/mavlink/v1.0/common/mavlink_msg_mission_request_partial_list.h
-include/mavlink/v1.0/common/mavlink_msg_mission_set_current.h
-include/mavlink/v1.0/common/mavlink_msg_mission_write_partial_list.h
-include/mavlink/v1.0/common/mavlink_msg_named_value_float.h
-include/mavlink/v1.0/common/mavlink_msg_named_value_int.h
-include/mavlink/v1.0/common/mavlink_msg_nav_controller_output.h
-include/mavlink/v1.0/common/mavlink_msg_optical_flow.h
-include/mavlink/v1.0/common/mavlink_msg_optical_flow_rad.h
-include/mavlink/v1.0/common/mavlink_msg_param_map_rc.h
-include/mavlink/v1.0/common/mavlink_msg_param_request_list.h
-include/mavlink/v1.0/common/mavlink_msg_param_request_read.h
-include/mavlink/v1.0/common/mavlink_msg_param_set.h
-include/mavlink/v1.0/common/mavlink_msg_param_value.h
-include/mavlink/v1.0/common/mavlink_msg_ping.h
-include/mavlink/v1.0/common/mavlink_msg_position_target_global_int.h
-include/mavlink/v1.0/common/mavlink_msg_position_target_local_ned.h
-include/mavlink/v1.0/common/mavlink_msg_power_status.h
-include/mavlink/v1.0/common/mavlink_msg_radio_status.h
-include/mavlink/v1.0/common/mavlink_msg_raw_imu.h
-include/mavlink/v1.0/common/mavlink_msg_raw_pressure.h
-include/mavlink/v1.0/common/mavlink_msg_rc_channels.h
-include/mavlink/v1.0/common/mavlink_msg_rc_channels_override.h
-include/mavlink/v1.0/common/mavlink_msg_rc_channels_raw.h
-include/mavlink/v1.0/common/mavlink_msg_rc_channels_scaled.h
-include/mavlink/v1.0/common/mavlink_msg_request_data_stream.h
-include/mavlink/v1.0/common/mavlink_msg_resource_request.h
-include/mavlink/v1.0/common/mavlink_msg_safety_allowed_area.h
-include/mavlink/v1.0/common/mavlink_msg_safety_set_allowed_area.h
-include/mavlink/v1.0/common/mavlink_msg_scaled_imu.h
-include/mavlink/v1.0/common/mavlink_msg_scaled_imu2.h
-include/mavlink/v1.0/common/mavlink_msg_scaled_imu3.h
-include/mavlink/v1.0/common/mavlink_msg_scaled_pressure.h
-include/mavlink/v1.0/common/mavlink_msg_scaled_pressure2.h
-include/mavlink/v1.0/common/mavlink_msg_scaled_pressure3.h
-include/mavlink/v1.0/common/mavlink_msg_serial_control.h
-include/mavlink/v1.0/common/mavlink_msg_servo_output_raw.h
-include/mavlink/v1.0/common/mavlink_msg_set_actuator_control_target.h
-include/mavlink/v1.0/common/mavlink_msg_set_attitude_target.h
-include/mavlink/v1.0/common/mavlink_msg_set_gps_global_origin.h
-include/mavlink/v1.0/common/mavlink_msg_set_home_position.h
-include/mavlink/v1.0/common/mavlink_msg_set_mode.h
-include/mavlink/v1.0/common/mavlink_msg_set_position_target_global_int.h
-include/mavlink/v1.0/common/mavlink_msg_set_position_target_local_ned.h
-include/mavlink/v1.0/common/mavlink_msg_sim_state.h
-include/mavlink/v1.0/common/mavlink_msg_statustext.h
-include/mavlink/v1.0/common/mavlink_msg_sys_status.h
-include/mavlink/v1.0/common/mavlink_msg_system_time.h
-include/mavlink/v1.0/common/mavlink_msg_terrain_check.h
-include/mavlink/v1.0/common/mavlink_msg_terrain_data.h
-include/mavlink/v1.0/common/mavlink_msg_terrain_report.h
-include/mavlink/v1.0/common/mavlink_msg_terrain_request.h
-include/mavlink/v1.0/common/mavlink_msg_timesync.h
-include/mavlink/v1.0/common/mavlink_msg_v2_extension.h
-include/mavlink/v1.0/common/mavlink_msg_vfr_hud.h
-include/mavlink/v1.0/common/mavlink_msg_vibration.h
-include/mavlink/v1.0/common/mavlink_msg_vicon_position_estimate.h
-include/mavlink/v1.0/common/mavlink_msg_vision_position_estimate.h
-include/mavlink/v1.0/common/mavlink_msg_vision_speed_estimate.h
-include/mavlink/v1.0/common/mavlink_msg_vtol_state.h
-include/mavlink/v1.0/common/testsuite.h
-include/mavlink/v1.0/common/version.h
-include/mavlink/v1.0/matrixpilot/matrixpilot.h
-include/mavlink/v1.0/matrixpilot/mavlink.h
-include/mavlink/v1.0/matrixpilot/mavlink_msg_airspeeds.h
-include/mavlink/v1.0/matrixpilot/mavlink_msg_altitudes.h
-include/mavlink/v1.0/matrixpilot/mavlink_msg_flexifunction_buffer_function.h
-include/mavlink/v1.0/matrixpilot/mavlink_msg_flexifunction_buffer_function_ack.h
-include/mavlink/v1.0/matrixpilot/mavlink_msg_flexifunction_command.h
-include/mavlink/v1.0/matrixpilot/mavlink_msg_flexifunction_command_ack.h
-include/mavlink/v1.0/matrixpilot/mavlink_msg_flexifunction_directory.h
-include/mavlink/v1.0/matrixpilot/mavlink_msg_flexifunction_directory_ack.h
-include/mavlink/v1.0/matrixpilot/mavlink_msg_flexifunction_read_req.h
-include/mavlink/v1.0/matrixpilot/mavlink_msg_flexifunction_set.h
-include/mavlink/v1.0/matrixpilot/mavlink_msg_serial_udb_extra_f13.h
-include/mavlink/v1.0/matrixpilot/mavlink_msg_serial_udb_extra_f14.h
-include/mavlink/v1.0/matrixpilot/mavlink_msg_serial_udb_extra_f15.h
-include/mavlink/v1.0/matrixpilot/mavlink_msg_serial_udb_extra_f16.h
-include/mavlink/v1.0/matrixpilot/mavlink_msg_serial_udb_extra_f2_a.h
-include/mavlink/v1.0/matrixpilot/mavlink_msg_serial_udb_extra_f2_b.h
-include/mavlink/v1.0/matrixpilot/mavlink_msg_serial_udb_extra_f4.h
-include/mavlink/v1.0/matrixpilot/mavlink_msg_serial_udb_extra_f5.h
-include/mavlink/v1.0/matrixpilot/mavlink_msg_serial_udb_extra_f6.h
-include/mavlink/v1.0/matrixpilot/mavlink_msg_serial_udb_extra_f7.h
-include/mavlink/v1.0/matrixpilot/mavlink_msg_serial_udb_extra_f8.h
-include/mavlink/v1.0/matrixpilot/testsuite.h
-include/mavlink/v1.0/matrixpilot/version.h
-include/mavlink/v1.0/mavlink_conversions.h
-include/mavlink/v1.0/mavlink_helpers.h
-include/mavlink/v1.0/mavlink_types.h
-include/mavlink/v1.0/minimal/mavlink.h
-include/mavlink/v1.0/minimal/mavlink_msg_heartbeat.h
-include/mavlink/v1.0/minimal/minimal.h
-include/mavlink/v1.0/minimal/testsuite.h
-include/mavlink/v1.0/minimal/version.h
-include/mavlink/v1.0/pixhawk/mavlink.h
-include/mavlink/v1.0/pixhawk/mavlink_msg_attitude_control.h
-include/mavlink/v1.0/pixhawk/mavlink_msg_brief_feature.h
-include/mavlink/v1.0/pixhawk/mavlink_msg_detection_stats.h
-include/mavlink/v1.0/pixhawk/mavlink_msg_image_available.h
-include/mavlink/v1.0/pixhawk/mavlink_msg_image_trigger_control.h
-include/mavlink/v1.0/pixhawk/mavlink_msg_image_triggered.h
-include/mavlink/v1.0/pixhawk/mavlink_msg_marker.h
-include/mavlink/v1.0/pixhawk/mavlink_msg_onboard_health.h
-include/mavlink/v1.0/pixhawk/mavlink_msg_pattern_detected.h
-include/mavlink/v1.0/pixhawk/mavlink_msg_point_of_interest.h
-include/mavlink/v1.0/pixhawk/mavlink_msg_point_of_interest_connection.h
-include/mavlink/v1.0/pixhawk/mavlink_msg_position_control_setpoint.h
-include/mavlink/v1.0/pixhawk/mavlink_msg_raw_aux.h
-include/mavlink/v1.0/pixhawk/mavlink_msg_set_cam_shutter.h
-include/mavlink/v1.0/pixhawk/mavlink_msg_set_position_control_offset.h
-include/mavlink/v1.0/pixhawk/mavlink_msg_watchdog_command.h
-include/mavlink/v1.0/pixhawk/mavlink_msg_watchdog_heartbeat.h
-include/mavlink/v1.0/pixhawk/mavlink_msg_watchdog_process_info.h
-include/mavlink/v1.0/pixhawk/mavlink_msg_watchdog_process_status.h
-include/mavlink/v1.0/pixhawk/pixhawk.h
-include/mavlink/v1.0/pixhawk/testsuite.h
-include/mavlink/v1.0/pixhawk/version.h
-include/mavlink/v1.0/protocol.h
-include/mavlink/v1.0/slugs/mavlink.h
-include/mavlink/v1.0/slugs/mavlink_msg_boot.h
-include/mavlink/v1.0/slugs/mavlink_msg_control_surface.h
-include/mavlink/v1.0/slugs/mavlink_msg_cpu_load.h
-include/mavlink/v1.0/slugs/mavlink_msg_ctrl_srfc_pt.h
-include/mavlink/v1.0/slugs/mavlink_msg_data_log.h
-include/mavlink/v1.0/slugs/mavlink_msg_diagnostic.h
-include/mavlink/v1.0/slugs/mavlink_msg_gps_date_time.h
-include/mavlink/v1.0/slugs/mavlink_msg_isr_location.h
-include/mavlink/v1.0/slugs/mavlink_msg_mid_lvl_cmds.h
-include/mavlink/v1.0/slugs/mavlink_msg_novatel_diag.h
-include/mavlink/v1.0/slugs/mavlink_msg_ptz_status.h
-include/mavlink/v1.0/slugs/mavlink_msg_sensor_bias.h
-include/mavlink/v1.0/slugs/mavlink_msg_sensor_diag.h
-include/mavlink/v1.0/slugs/mavlink_msg_slugs_camera_order.h
-include/mavlink/v1.0/slugs/mavlink_msg_slugs_configuration_camera.h
-include/mavlink/v1.0/slugs/mavlink_msg_slugs_mobile_location.h
-include/mavlink/v1.0/slugs/mavlink_msg_slugs_navigation.h
-include/mavlink/v1.0/slugs/mavlink_msg_status_gps.h
-include/mavlink/v1.0/slugs/mavlink_msg_uav_status.h
-include/mavlink/v1.0/slugs/mavlink_msg_volt_sensor.h
-include/mavlink/v1.0/slugs/slugs.h
-include/mavlink/v1.0/slugs/testsuite.h
-include/mavlink/v1.0/slugs/version.h
-include/mavlink/v1.0/test/mavlink.h
-include/mavlink/v1.0/test/mavlink_msg_test_types.h
-include/mavlink/v1.0/test/test.h
-include/mavlink/v1.0/test/testsuite.h
-include/mavlink/v1.0/test/version.h
-include/mavlink/v1.0/ualberta/mavlink.h
-include/mavlink/v1.0/ualberta/mavlink_msg_nav_filter_bias.h
-include/mavlink/v1.0/ualberta/mavlink_msg_radio_calibration.h
-include/mavlink/v1.0/ualberta/mavlink_msg_ualberta_sys_status.h
-include/mavlink/v1.0/ualberta/testsuite.h
-include/mavlink/v1.0/ualberta/ualberta.h
-include/mavlink/v1.0/ualberta/version.h
-lib/pkgconfig/mavlink.pc
-@pkgdir share/mavlink
diff --git a/mavlink/depend.mk b/mavlink/depend.mk
deleted file mode 100644
index ae3bbd6917c2ec21ccc6f9e5ac7db823c4884316..0000000000000000000000000000000000000000
--- a/mavlink/depend.mk
+++ /dev/null
@@ -1,26 +0,0 @@
-# robotpkg depend.mk for:	supervision/mavlink
-# Created:			Arnaud Degroote on Mon,  8 Oct 2012
-#
-
-DEPEND_DEPTH:=		${DEPEND_DEPTH}+
-MAVLINK_DEPEND_MK:=${MAVLINK_DEPEND_MK}+
-
-ifeq (+,$(DEPEND_DEPTH))
-DEPEND_PKG+=		mavlink
-endif
-
-ifeq (+,$(MAVLINK_DEPEND_MK))
-PREFER.mavlink?=	robotpkg
-
-DEPEND_USE+=		mavlink
-
-DEPEND_ABI.mavlink?=	mavlink>=1.0.9
-DEPEND_DIR.mavlink?=	../../wip/mavlink
-
-SYSTEM_SEARCH.mavlink=\
-	include/mavlink/config.h\
-	'lib/pkgconfig/mavlink.pc:/Version/s/[^0-9.]//gp'
-endif
-
-
-DEPEND_DEPTH:=		${DEPEND_DEPTH:+=}
diff --git a/mavlink/distinfo b/mavlink/distinfo
deleted file mode 100644
index 79639e89c0f7d534425f2df88405725b9cc7c75a..0000000000000000000000000000000000000000
--- a/mavlink/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-SHA1 (mavlink-20150929.tar.gz) = b2f15e15c6b9f597974beeddc5a13bef019102b1
-RMD160 (mavlink-20150929.tar.gz) = 9dc09cc87ecf37ec6f8ce108358e6891008c014f
-SHA1 (patch-dont-install-pymavlink) = 6c13ab0095bbd18d76861b5cf3a2c7b5d497b742
diff --git a/mavlink/patches/patch-dont-install-pymavlink b/mavlink/patches/patch-dont-install-pymavlink
deleted file mode 100644
index 2429c73a525c7472a24be8294b200066c2b0046a..0000000000000000000000000000000000000000
--- a/mavlink/patches/patch-dont-install-pymavlink
+++ /dev/null
@@ -1,14 +0,0 @@
---- CMakeLists.txt.orig	2015-09-29 14:36:39.174556893 +0200
-+++ CMakeLists.txt	2015-09-29 14:36:48.654557150 +0200
-@@ -170,11 +170,6 @@
- install(DIRECTORY ${CMAKE_BINARY_DIR}/include/ DESTINATION include/${PROJECT_NAME} COMPONENT Dev FILES_MATCHING PATTERN "*.h*")
- install(DIRECTORY ${CMAKE_BINARY_DIR}/src/ DESTINATION share/${PROJECT_NAME} COMPONENT Dev FILES_MATCHING PATTERN "*.c*")
- install(DIRECTORY ${CMAKE_SOURCE_DIR}/share/${PROJECT_NAME} DESTINATION share COMPONENT Dev FILES_MATCHING PATTERN "*.c*")
--if (UNIX)
--    install(DIRECTORY ${CMAKE_SOURCE_DIR}/pymavlink DESTINATION ${CMAKE_INSTALL_LIBDIR}/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages COMPONENT Dev)
--else ()
--    install(DIRECTORY ${CMAKE_SOURCE_DIR}/pymavlink DESTINATION "share/pyshared" COMPONENT Dev)
--endif ()
- 
- configure_file(pc.in ${PROJECT_NAME}.pc)
- install(FILES