diff --git a/common/main/fwd-weapon.h b/common/main/fwd-weapon.h
index 79d6b2793..a6cf2adcd 100644
--- a/common/main/fwd-weapon.h
+++ b/common/main/fwd-weapon.h
@@ -223,10 +223,10 @@ extern fix64 Seismic_disturbance_end_time;
 #ifdef dsx
 namespace dsx {
 void InitWeaponOrdering();
+void CyclePrimary(player_info &);
 void CycleSecondary(player_info &);
 }
 #endif
-void CyclePrimary();
 void ReorderPrimary();
 void ReorderSecondary();
 #ifdef dsx
diff --git a/similar/main/gamecntl.cpp b/similar/main/gamecntl.cpp
index 783cf9702..b6084289c 100644
--- a/similar/main/gamecntl.cpp
+++ b/similar/main/gamecntl.cpp
@@ -255,7 +255,7 @@ static void do_weapon_n_item_stuff()
 	if (Controls.state.cycle_primary > 0)
 	{
 		for (uint_fast32_t i = exchange(Controls.state.cycle_primary, 0); i--;)
-			CyclePrimary ();
+			CyclePrimary(player_info);
 	}
 	if (Controls.state.cycle_secondary > 0)
 	{
diff --git a/similar/main/weapon.cpp b/similar/main/weapon.cpp
index 91ba44d25..e0767183d 100644
--- a/similar/main/weapon.cpp
+++ b/similar/main/weapon.cpp
@@ -414,16 +414,13 @@ void CycleWeapon(T t, const uint_fast32_t effective_weapon)
 	}
 }
 
-}
 }
 
-void CyclePrimary ()
+void CyclePrimary(player_info &player_info)
 {
-	auto &player_info = get_local_plrobj().ctype.player_info;
 	CycleWeapon(cycle_primary_state(player_info), get_mapped_weapon_index(player_info, player_info.Primary_weapon));
 }
 
-namespace dsx {
 void CycleSecondary(player_info &player_info)
 {
 	CycleWeapon(cycle_secondary_state(player_info), player_info.Secondary_weapon);