ArdruCopter SITL Build Error

I am trying to setup SITL for ArduCopter and am having some problems. I am on Windows, running in Cygwin. I am running: make sitl -j4

I have had to fix a couple of PATH errors during the UAVCAN build and now I am having problems just after the Mavgen: success, in the build_rules.mk file.

Here is the error below, just after Mavgen: success.

mavgen: success
%% compat.o
%% ArduCopter.o
%% control_drift.o
In file included from /home/harri/ardupilot/modules/mavlink/pymavlink/generator/C/include_v1.0/test/test.h:48:0,
from /home/harri/ardupilot/modules/mavlink/pymavlink/generator/C/include_v1.0/test/mavlink.h:25,
from /home/harri/ardupilot/libraries/GCS_MAVLink/GCS_MAVLink.h:90,
from /home/harri/ardupilot/libraries/GCS_MAVLink/GCS.h:8,
from Copter.h:37,
from compat.cpp:1:
/home/harri/ardupilot/modules/mavlink/pymavlink/generator/C/include_v1.0/test/mavlink_msg_test_types.h: In function ‘uint16_t mavlink_msg_test_types_pack(uint8_t, uint8_t, mavlink_message_t*, char, const char*, uint8_t, uint16_t, uint32_t, uint64_t, int8_t, int16_t, int32_t, int64_t, float, double, const uint8_t*, const uint16_t*, const uint32_t*, const uint64_t*, const int8_t*, const int16_t*, const int32_t*, const int64_t*, const float*, const double*)’:
/home/harri/ardupilot/modules/mavlink/pymavlink/generator/C/include_v1.0/test/mavlink_msg_test_types.h:165:75: error: too few arguments to function 'uint16_t mavlink_finalize_message(mavlink_message_t*, uint8_t, uint8_t, uint8_t, uint8_t, uint8_t)'
return mavlink_finalize_message(msg, system_id, component_id, MAVLINK_MSG_ID_TEST_TYPES_LEN, MAVLINK_MSG_ID_TEST_TYPES_CRC);
^
compilation terminated due to -Wfatal-errors.
make: *** [C:/cygwin/home/harri/ardupilot/mk/build_rules.mk:12: /tmp/ArduCopter.build/compat.o] Error 1
make: *** Waiting for unfinished jobs…
In file included from /home/harri/ardupilot/modules/mavlink/pymavlink/generator/C/include_v1.0/test/test.h:48:0,
from /home/harri/ardupilot/modules/mavlink/pymavlink/generator/C/include_v1.0/test/mavlink.h:25,
from /home/harri/ardupilot/libraries/GCS_MAVLink/GCS_MAVLink.h:90,
from /home/harri/ardupilot/libraries/GCS_MAVLink/GCS.h:8,
from Copter.h:37,
from ArduCopter.cpp:76:
/home/harri/ardupilot/modules/mavlink/pymavlink/generator/C/include_v1.0/test/mavlink_msg_test_types.h: In function ‘uint16_t mavlink_msg_test_types_pack(uint8_t, uint8_t, mavlink_message_t*, char, const char*, uint8_t, uint16_t, uint32_t, uint64_t, int8_t, int16_t, int32_t, int64_t, float, double, const uint8_t*, const uint16_t*, const uint32_t*, const uint64_t*, const int8_t*, const int16_t*, const int32_t*, const int64_t*, const float*, const double*)’:
/home/harri/ardupilot/modules/mavlink/pymavlink/generator/C/include_v1.0/test/mavlink_msg_test_types.h:165:75: error: too few arguments to function 'uint16_t mavlink_finalize_message(mavlink_message_t*, uint8_t, uint8_t, uint8_t, uint8_t, uint8_t)'
return mavlink_finalize_message(msg, system_id, component_id, MAVLINK_MSG_ID_TEST_TYPES_LEN, MAVLINK_MSG_ID_TEST_TYPES_CRC);
^
compilation terminated due to -Wfatal-errors.
make: *** [C:/cygwin/home/harri/ardupilot/mk/build_rules.mk:12: /tmp/ArduCopter.build/ArduCopter.o] Error 1
In file included from /home/harri/ardupilot/modules/mavlink/pymavlink/generator/C/include_v1.0/test/test.h:48:0,
from /home/harri/ardupilot/modules/mavlink/pymavlink/generator/C/include_v1.0/test/mavlink.h:25,
from /home/harri/ardupilot/libraries/GCS_MAVLink/GCS_MAVLink.h:90,
from /home/harri/ardupilot/libraries/GCS_MAVLink/GCS.h:8,
from Copter.h:37,
from control_drift.cpp:1:
/home/harri/ardupilot/modules/mavlink/pymavlink/generator/C/include_v1.0/test/mavlink_msg_test_types.h: In function ‘uint16_t mavlink_msg_test_types_pack(uint8_t, uint8_t, mavlink_message_t*, char, const char*, uint8_t, uint16_t, uint32_t, uint64_t, int8_t, int16_t, int32_t, int64_t, float, double, const uint8_t*, const uint16_t*, const uint32_t*, const uint64_t*, const int8_t*, const int16_t*, const int32_t*, const int64_t*, const float*, const double*)’:
/home/harri/ardupilot/modules/mavlink/pymavlink/generator/C/include_v1.0/test/mavlink_msg_test_types.h:165:75: error: too few arguments to function 'uint16_t mavlink_finalize_message(mavlink_message_t*, uint8_t, uint8_t, uint8_t, uint8_t, uint8_t)'
return mavlink_finalize_message(msg, system_id, component_id, MAVLINK_MSG_ID_TEST_TYPES_LEN, MAVLINK_MSG_ID_TEST_TYPES_CRC);
^
compilation terminated due to -Wfatal-errors.
make: *** [C:/cygwin/home/harri/ardupilot/mk/build_rules.mk:12: /tmp/ArduCopter.build/control_drift.o] Error 1