diff --git a/sources.cmake b/sources.cmake
index 34ecebe8c..bb3457c02 100644
--- a/sources.cmake
+++ b/sources.cmake
@@ -100,8 +100,8 @@ src/karts/controller/end_controller.cpp
 src/karts/controller/new_ai_controller.cpp
 src/karts/controller/player_controller.cpp
 src/karts/ghost_kart.cpp
-src/karts/kart.cpp
 src/karts/kart_animation.cpp
+src/karts/kart.cpp
 src/karts/kart_gfx.cpp
 src/karts/kart_model.cpp
 src/karts/kart_properties.cpp
@@ -177,13 +177,13 @@ src/states_screens/kart_selection.cpp
 src/states_screens/main_menu_screen.cpp
 src/states_screens/minimal_race_gui.cpp
 src/states_screens/options_screen_audio.cpp
-src/states_screens/options_screen_input.cpp
 src/states_screens/options_screen_input2.cpp
+src/states_screens/options_screen_input.cpp
 src/states_screens/options_screen_players.cpp
 src/states_screens/options_screen_ui.cpp
 src/states_screens/options_screen_video.cpp
-src/states_screens/race_gui.cpp
 src/states_screens/race_gui_base.cpp
+src/states_screens/race_gui.cpp
 src/states_screens/race_gui_overworld.cpp
 src/states_screens/race_result_gui.cpp
 src/states_screens/race_setup_screen.cpp
@@ -202,6 +202,7 @@ src/tinygettext/stk_file_system.cpp
 src/tinygettext/tinygettext.cpp
 src/tracks/ambient_light_sphere.cpp
 src/tracks/bezier_curve.cpp
+src/tracks/check_canon.cpp
 src/tracks/check_lap.cpp
 src/tracks/check_line.cpp
 src/tracks/check_manager.cpp
@@ -243,8 +244,8 @@ src/animations/billboard_animation.hpp
 src/animations/ipo.hpp
 src/animations/three_d_animation.hpp
 src/audio/dummy_sfx.hpp
-src/audio/music.hpp
 src/audio/music_dummy.hpp
+src/audio/music.hpp
 src/audio/music_information.hpp
 src/audio/music_manager.hpp
 src/audio/music_ogg.hpp
@@ -252,8 +253,8 @@ src/audio/sfx_base.hpp
 src/audio/sfx_buffer.hpp
 src/audio/sfx_manager.hpp
 src/audio/sfx_openal.hpp
-src/challenges/challenge.hpp
 src/challenges/challenge_data.hpp
+src/challenges/challenge.hpp
 src/challenges/game_slot.hpp
 src/challenges/unlock_manager.hpp
 src/config/device_config.hpp
@@ -293,11 +294,11 @@ src/guiengine/scalable_font.hpp
 src/guiengine/screen.hpp
 src/guiengine/skin.hpp
 src/guiengine/widget.hpp
-src/guiengine/widgets.hpp
 src/guiengine/widgets/bubble_widget.hpp
 src/guiengine/widgets/button_widget.hpp
 src/guiengine/widgets/check_box_widget.hpp
 src/guiengine/widgets/dynamic_ribbon_widget.hpp
+src/guiengine/widgets.hpp
 src/guiengine/widgets/icon_button_widget.hpp
 src/guiengine/widgets/label_widget.hpp
 src/guiengine/widgets/list_widget.hpp
@@ -308,8 +309,8 @@ src/guiengine/widgets/spinner_widget.hpp
 src/guiengine/widgets/text_box_widget.hpp
 src/input/binding.hpp
 src/input/device_manager.hpp
-src/input/input.hpp
 src/input/input_device.hpp
+src/input/input.hpp
 src/input/input_manager.hpp
 src/input/wiimote_manager.hpp
 src/io/file_manager.hpp
@@ -339,9 +340,9 @@ src/karts/controller/kart_control.hpp
 src/karts/controller/new_ai_controller.hpp
 src/karts/controller/player_controller.hpp
 src/karts/ghost_kart.hpp
-src/karts/kart.hpp
 src/karts/kart_animation.hpp
 src/karts/kart_gfx.hpp
+src/karts/kart.hpp
 src/karts/kart_model.hpp
 src/karts/kart_properties.hpp
 src/karts/kart_properties_manager.hpp
@@ -428,13 +429,13 @@ src/states_screens/kart_selection.hpp
 src/states_screens/main_menu_screen.hpp
 src/states_screens/minimal_race_gui.hpp
 src/states_screens/options_screen_audio.hpp
-src/states_screens/options_screen_input.hpp
 src/states_screens/options_screen_input2.hpp
+src/states_screens/options_screen_input.hpp
 src/states_screens/options_screen_players.hpp
 src/states_screens/options_screen_ui.hpp
 src/states_screens/options_screen_video.hpp
-src/states_screens/race_gui.hpp
 src/states_screens/race_gui_base.hpp
+src/states_screens/race_gui.hpp
 src/states_screens/race_gui_overworld.hpp
 src/states_screens/race_result_gui.hpp
 src/states_screens/race_setup_screen.hpp
@@ -455,6 +456,7 @@ src/tinygettext/stk_file_system.hpp
 src/tinygettext/tinygettext.hpp
 src/tracks/ambient_light_sphere.hpp
 src/tracks/bezier_curve.hpp
+src/tracks/check_canon.hpp
 src/tracks/check_lap.hpp
 src/tracks/check_line.hpp
 src/tracks/check_manager.hpp
@@ -462,8 +464,8 @@ src/tracks/check_sphere.hpp
 src/tracks/check_structure.hpp
 src/tracks/graph_node.hpp
 src/tracks/lod_node_loader.hpp
-src/tracks/quad.hpp
 src/tracks/quad_graph.hpp
+src/tracks/quad.hpp
 src/tracks/quad_set.hpp
 src/tracks/terrain_info.hpp
 src/tracks/track.hpp
@@ -471,8 +473,8 @@ src/tracks/track_manager.hpp
 src/tracks/track_object.hpp
 src/tracks/track_object_manager.hpp
 src/tracks/track_sector.hpp
-src/tutorial/tutorial.hpp
 src/tutorial/tutorial_data.hpp
+src/tutorial/tutorial.hpp
 src/tutorial/tutorial_manager.hpp
 src/utils/aligned_array.hpp
 src/utils/constants.hpp