diff --git a/cockatrice/src/game/arrow_registry.cpp b/cockatrice/src/game/arrow_registry.cpp
index e679d2972..286764b3b 100644
--- a/cockatrice/src/game/arrow_registry.cpp
+++ b/cockatrice/src/game/arrow_registry.cpp
@@ -1,6 +1,6 @@
 #include "arrow_registry.h"
 
-#include "board/arrow_item.h"
+#include "../game_graphics/board/arrow_item.h"
 
 void ArrowRegistry::insert(QSharedPointer<ArrowData> data, ArrowItem *arrow)
 {
diff --git a/cockatrice/src/game/player/player_actions.cpp b/cockatrice/src/game/player/player_actions.cpp
index 773bdda2a..de909ca5e 100644
--- a/cockatrice/src/game/player/player_actions.cpp
+++ b/cockatrice/src/game/player/player_actions.cpp
@@ -1,6 +1,5 @@
 #include "player_actions.h"
 
-#include "../../game_graphics/board/card_item.h"
 #include "../../game_graphics/dialogs/dlg_move_top_cards_until.h"
 #include "../../game_graphics/dialogs/dlg_roll_dice.h"
 #include "../../game_graphics/player/card_menu_action_type.h"
diff --git a/cockatrice/src/game/player/player_actions.h b/cockatrice/src/game/player/player_actions.h
index 22e6174d7..3f1960892 100644
--- a/cockatrice/src/game/player/player_actions.h
+++ b/cockatrice/src/game/player/player_actions.h
@@ -7,6 +7,8 @@
 
 #ifndef COCKATRICE_PLAYER_ACTIONS_H
 #define COCKATRICE_PLAYER_ACTIONS_H
+
+#include "../../game_graphics/board/card_item.h"
 #include "../../game_graphics/dialogs/dlg_create_token.h"
 #include "../../game_graphics/dialogs/dlg_move_top_cards_until.h"
 #include "../../game_graphics/player/card_menu_action_type.h"
@@ -26,7 +28,6 @@ class Message;
 }
 } // namespace google
 
-class CardItem;
 class Command_MoveCard;
 class GameEventContext;
 class PendingCommand;
diff --git a/cockatrice/src/game_graphics/board/arrow_item.h b/cockatrice/src/game_graphics/board/arrow_item.h
index 0c04c27f8..1c306e065 100644
--- a/cockatrice/src/game_graphics/board/arrow_item.h
+++ b/cockatrice/src/game_graphics/board/arrow_item.h
@@ -1,7 +1,7 @@
 #ifndef ARROWITEM_H
 #define ARROWITEM_H
 
-#include "arrow_data.h"
+#include "../../game/board/arrow_data.h"
 #include "arrow_target.h"
 
 #include <QGraphicsItem>
diff --git a/cockatrice/src/game_graphics/game_scene.h b/cockatrice/src/game_graphics/game_scene.h
index 6c1b1300a..74e979556 100644
--- a/cockatrice/src/game_graphics/game_scene.h
+++ b/cockatrice/src/game_graphics/game_scene.h
@@ -1,7 +1,7 @@
 #ifndef GAMESCENE_H
 #define GAMESCENE_H
 
-#include "arrow_registry.h"
+#include "../game/arrow_registry.h"
 #include "../game/board/arrow_data.h"
 #include "../game/zones/card_zone_logic.h"
 #include "board/arrow_item.h"
diff --git a/cockatrice/src/game_graphics/player/player_dialogs.h b/cockatrice/src/game_graphics/player/player_dialogs.h
index 975440b67..f87704f2d 100644
--- a/cockatrice/src/game_graphics/player/player_dialogs.h
+++ b/cockatrice/src/game_graphics/player/player_dialogs.h
@@ -1,6 +1,7 @@
 #ifndef COCKATRICE_PLAYER_DIALOGS_H
 #define COCKATRICE_PLAYER_DIALOGS_H
 #include "../../game/player/player_actions.h"
+#include "player_graphics_item.h"
 
 #include <QGraphicsView>
 #include <QObject>