diff --git a/src/game/boe.actions.hpp b/src/game/boe.actions.hpp
index 8e1902c9..f04d9c93 100644
--- a/src/game/boe.actions.hpp
+++ b/src/game/boe.actions.hpp
@@ -36,4 +36,19 @@ short count_walls(location loc);
 bool is_sign(ter_num_t ter);
 bool check_for_interrupt();
 
+void handle_startup_button_click(eStartButton btn);
+void handle_switch_pc(short which_pc, bool& need_redraw, bool& need_reprint);
+void handle_switch_pc_items(short which_pc, bool& need_redraw);
+void handle_equip_item(short item_hit, bool& need_redraw);
+void handle_use_item(short item_hit, bool& did_something, bool& need_redraw);
+void handle_item_shop_action(short item_hit);
+void handle_alchemy(bool& need_redraw, bool& need_reprint);
+void handle_town_wait(bool& need_redraw, bool& need_reprint);
+void handle_combat_switch(bool& did_something, bool& need_redraw, bool& need_reprint);
+void handle_missile(bool& need_redraw, bool& need_reprint);
+void handle_get_items(bool& did_something, bool& need_redraw, bool& need_reprint);
+void handle_drop_item(short item_hit, bool& need_redraw);
+void handle_drop_item(location destination, bool& need_redraw);
+void handle_give_item(short item_hit, bool& did_something, bool& need_redraw);
+
 #endif
diff --git a/src/game/boe.main.cpp b/src/game/boe.main.cpp
index 1dcb05f9..bf8e63eb 100644
--- a/src/game/boe.main.cpp
+++ b/src/game/boe.main.cpp
@@ -120,23 +120,6 @@ extern long anim_ticks;
 static void init_boe(int, char*[]);
 static void showWelcome();
 
-// TODO all these forward declarations of boe.actions.cpp functions might be less
-// than ideal. Maybe they could be moved to boe.actions.hpp and #included here instead
-void handle_startup_button_click(eStartButton btn);
-void handle_switch_pc(short which_pc, bool& need_redraw, bool& need_reprint);
-void handle_switch_pc_items(short which_pc, bool& need_redraw);
-void handle_equip_item(short item_hit, bool& need_redraw);
-void handle_use_item(short item_hit, bool& did_something, bool& need_redraw);
-void handle_item_shop_action(short item_hit);
-void handle_alchemy(bool& need_redraw, bool& need_reprint);
-void handle_town_wait(bool& need_redraw, bool& need_reprint);
-void handle_combat_switch(bool& did_something, bool& need_redraw, bool& need_reprint);
-void handle_missile(bool& need_redraw, bool& need_reprint);
-void handle_get_items(bool& did_something, bool& need_redraw, bool& need_reprint);
-void handle_drop_item(short item_hit, bool& need_redraw);
-void handle_drop_item(location destination, bool& need_redraw);
-void handle_give_item(short item_hit, bool& did_something, bool& need_redraw);
-
 void handle_quit_event();
 
 #ifdef __APPLE__