diff --git a/cockatrice/CMakeLists.txt b/cockatrice/CMakeLists.txt
index 442ecd2c2..8e44e0b65 100644
--- a/cockatrice/CMakeLists.txt
+++ b/cockatrice/CMakeLists.txt
@@ -7,6 +7,16 @@ project(Cockatrice VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${
 set(cockatrice_SOURCES
     ${VERSION_STRING_CPP}
     # sort by alphabetical order, so that there is no debate about where to add new sources to the list
+    src/card/card_completer_proxy_model.cpp
+    src/card/card_database.cpp
+    src/card/card_database_manager.cpp
+    src/card/card_database_model.cpp
+    src/card/card_database_parser/card_database_parser.cpp
+    src/card/card_database_parser/cockatrice_xml_3.cpp
+    src/card/card_database_parser/cockatrice_xml_4.cpp
+    src/card/card_info.cpp
+    src/card/card_search_model.cpp
+    src/card/exact_card.cpp
     src/client/get_text_with_max.cpp
     src/client/menus/deck_editor/deck_editor_menu.cpp
     src/client/network/client_update_checker.cpp
@@ -182,6 +192,13 @@ set(cockatrice_SOURCES
     src/dialogs/dlg_tip_of_the_day.cpp
     src/dialogs/dlg_update.cpp
     src/dialogs/dlg_view_log.cpp
+    src/filters/deck_filter_string.cpp
+    src/filters/filter_builder.cpp
+    src/filters/filter_card.cpp
+    src/filters/filter_string.cpp
+    src/filters/filter_tree.cpp
+    src/filters/filter_tree_model.cpp
+    src/filters/syntax_help.cpp
     src/game/board/abstract_card_drag_item.cpp
     src/game/board/abstract_card_item.cpp
     src/game/board/abstract_counter.cpp
@@ -192,26 +209,9 @@ set(cockatrice_SOURCES
     src/game/board/card_item.cpp
     src/game/board/card_list.cpp
     src/game/board/counter_general.cpp
-    src/card/card_completer_proxy_model.cpp
-    src/card/card_database.cpp
-    src/card/card_database_manager.cpp
-    src/card/card_database_model.cpp
-    src/card/card_database_parser/card_database_parser.cpp
-    src/card/card_database_parser/cockatrice_xml_3.cpp
-    src/card/card_database_parser/cockatrice_xml_4.cpp
-    src/card/card_info.cpp
-    src/card/card_search_model.cpp
-    src/card/exact_card.cpp
     src/game/deckview/deck_view.cpp
     src/game/deckview/deck_view_container.cpp
     src/game/deckview/tabbed_deck_view_container.cpp
-    src/filters/deck_filter_string.cpp
-    src/filters/filter_builder.cpp
-    src/filters/filter_card.cpp
-    src/filters/filter_string.cpp
-    src/filters/filter_tree.cpp
-    src/filters/filter_tree_model.cpp
-    src/filters/syntax_help.cpp
     src/game/abstract_game.cpp
     src/game/game.cpp
     src/game/game_event_handler.cpp
diff --git a/oracle/CMakeLists.txt b/oracle/CMakeLists.txt
index 4d866b49c..f44e77387 100644
--- a/oracle/CMakeLists.txt
+++ b/oracle/CMakeLists.txt
@@ -17,12 +17,12 @@ set(oracle_SOURCES
     src/pagetemplates.cpp
     src/parsehelpers.cpp
     src/qt-json/json.cpp
-    ../cockatrice/src/card/card_info.cpp
-    ../cockatrice/src/client/ui/widgets/quick_settings/settings_button_widget.cpp
-    ../cockatrice/src/client/ui/widgets/quick_settings/settings_popup_widget.cpp
     ../cockatrice/src/card/card_database_parser/card_database_parser.cpp
     ../cockatrice/src/card/card_database_parser/cockatrice_xml_3.cpp
     ../cockatrice/src/card/card_database_parser/cockatrice_xml_4.cpp
+    ../cockatrice/src/card/card_info.cpp
+    ../cockatrice/src/client/ui/widgets/quick_settings/settings_button_widget.cpp
+    ../cockatrice/src/client/ui/widgets/quick_settings/settings_popup_widget.cpp
     ../cockatrice/src/settings/cache_settings.cpp
     ../cockatrice/src/settings/shortcuts_settings.cpp
     ../cockatrice/src/settings/card_counter_settings.cpp