diff --git a/cockatrice/src/game/abstract_game.h b/cockatrice/src/game/abstract_game.h
index 6c1564dc1..93b9fe76b 100644
--- a/cockatrice/src/game/abstract_game.h
+++ b/cockatrice/src/game/abstract_game.h
@@ -7,10 +7,10 @@
 #ifndef COCKATRICE_ABSTRACT_GAME_H
 #define COCKATRICE_ABSTRACT_GAME_H
 
-#include "pb/game_replay.pb.h"
 #include "game_event_handler.h"
 #include "game_meta_info.h"
 #include "game_state.h"
+#include "pb/game_replay.pb.h"
 #include "player/player_manager.h"
 
 #include <QObject>
diff --git a/cockatrice/src/game/player/menu/player_menu.cpp b/cockatrice/src/game/player/menu/player_menu.cpp
index e1bb7d8c6..51ec6535b 100644
--- a/cockatrice/src/game/player/menu/player_menu.cpp
+++ b/cockatrice/src/game/player/menu/player_menu.cpp
@@ -1,6 +1,5 @@
 #include "player_menu.h"
 
-#include "pb/command_reveal_cards.pb.h"
 #include "../../../tabs/tab_game.h"
 #include "../../board/card_item.h"
 #include "../../zones/hand_zone.h"
@@ -9,6 +8,7 @@
 #include "card/card_database/card_database_manager.h"
 #include "card_menu.h"
 #include "hand_menu.h"
+#include "pb/command_reveal_cards.pb.h"
 
 PlayerMenu::PlayerMenu(Player *_player) : player(_player)
 {
diff --git a/cockatrice/src/game/player/player_actions.cpp b/cockatrice/src/game/player/player_actions.cpp
index f2ea57fca..8a3277c7f 100644
--- a/cockatrice/src/game/player/player_actions.cpp
+++ b/cockatrice/src/game/player/player_actions.cpp
@@ -1,7 +1,5 @@
 #include "player_actions.h"
 
-#include "utility/trice_limits.h"
-#include "pb/context_move_card.pb.h"
 #include "../../client/get_text_with_max.h"
 #include "../../tabs/tab_game.h"
 #include "../board/card_item.h"
@@ -26,6 +24,8 @@
 #include "pb/command_set_card_counter.pb.h"
 #include "pb/command_shuffle.pb.h"
 #include "pb/command_undo_draw.pb.h"
+#include "pb/context_move_card.pb.h"
+#include "utility/trice_limits.h"
 
 // milliseconds in between triggers of the move top cards until action
 static constexpr int MOVE_TOP_CARD_UNTIL_INTERVAL = 100;
diff --git a/cockatrice/src/game/player/player_info.h b/cockatrice/src/game/player/player_info.h
index ef7d52577..c4ffdef60 100644
--- a/cockatrice/src/game/player/player_info.h
+++ b/cockatrice/src/game/player/player_info.h
@@ -7,12 +7,12 @@
 #ifndef COCKATRICE_PLAYER_INFO_H
 #define COCKATRICE_PLAYER_INFO_H
 
-#include "pb/serverinfo_user.pb.h"
 #include "../../deck/deck_loader.h"
 #include "../zones/hand_zone.h"
 #include "../zones/pile_zone.h"
 #include "../zones/stack_zone.h"
 #include "../zones/table_zone.h"
+#include "pb/serverinfo_user.pb.h"
 #include "player_target.h"
 
 #include <QObject>
diff --git a/cockatrice/src/server/game_selector.h b/cockatrice/src/server/game_selector.h
index b59bcb6b2..303ae4768 100644
--- a/cockatrice/src/server/game_selector.h
+++ b/cockatrice/src/server/game_selector.h
@@ -10,9 +10,9 @@
 #include "game_type_map.h"
 
 #include <QGroupBox>
+#include <pb/commands.pb.h>
 #include <pb/event_add_to_list.pb.h>
 #include <pb/event_remove_from_list.pb.h>
-#include <pb/commands.pb.h>
 
 class QTreeView;
 class GamesModel;