diff --git a/src/ai/default/attack.cpp b/src/ai/default/attack.cpp
index 50cab45a592..392d2118ce8 100644
--- a/src/ai/default/attack.cpp
+++ b/src/ai/default/attack.cpp
@@ -659,7 +659,7 @@ double ai_default::power_projection(const map_location& loc, const move_map& dst
 	map_location locs[6];
 	get_adjacent_tiles(loc,locs);
 
-	const int lawful_bonus = state_.get_time_of_day().lawful_bonus;
+	const int lawful_bonus = tod_manager_.get_time_of_day().lawful_bonus;
 
 	int res = 0;
 
diff --git a/src/game_events.cpp b/src/game_events.cpp
index b265616ea35..9bfba7ab173 100644
--- a/src/game_events.cpp
+++ b/src/game_events.cpp
@@ -826,7 +826,7 @@ WML_HANDLER_FUNCTION(store_time_of_day, /*event_info*/, cfg)
 
 		const map_location loc = cfg_to_loc(cfg, -999, -999);
 		const size_t turn = lexical_cast_default<size_t>(cfg["turn"], 0);
-		const time_of_day tod = turn ? rsrc.status_ptr->get_time_of_day(0,loc,turn) : rsrc.status_ptr->get_time_of_day(0,loc);
+		const time_of_day tod = turn ? rsrc.controller->get_tod_manager().get_time_of_day(0,loc,turn) : rsrc.controller->get_tod_manager().get_time_of_day(0,loc);
 
 		std::string variable = cfg["variable"];
 		if(variable.empty()) {
@@ -1043,7 +1043,7 @@ WML_HANDLER_FUNCTION(store_turns, /*event_info*/, cfg)
 		if(var_name.empty()) {
 			var_name = "turns";
 		}
-	int turns = rsrc.status_ptr->number_of_turns();
+	int turns = rsrc.controller->number_of_turns();
 	rsrc.state_of_game->get_variable(var_name) = lexical_cast_default<std::string>(turns);
 }
 
diff --git a/src/game_events.hpp b/src/game_events.hpp
index c47d7350b70..84574fc6cae 100644
--- a/src/game_events.hpp
+++ b/src/game_events.hpp
@@ -57,7 +57,7 @@ namespace game_events
 		unit_map *units;
 		std::vector<team> *teams;
 		game_state *state_of_game;
-		gamestatus *status_ptr;
+		gamestatus *status_ptr; //FIXME: give resources_t its own tod_manager
 		LuaKernel *lua_kernel;
 		play_controller *controller;
 	};
diff --git a/src/multiplayer_connect.cpp b/src/multiplayer_connect.cpp
index 9683ced8ca7..a167c64b271 100644
--- a/src/multiplayer_connect.cpp
+++ b/src/multiplayer_connect.cpp
@@ -1589,7 +1589,7 @@ void connect::load_game()
 
 		if (params_.random_start_time)
 		{
-			if (!gamestatus::is_start_ToD(level_["random_start_time"]))
+			if (!tod_manager::is_start_ToD(level_["random_start_time"]))
 			{
 				level_["random_start_time"] = "yes";
 			}
diff --git a/src/play_controller.cpp b/src/play_controller.cpp
index a7a4a4691da..0b31cb72b10 100644
--- a/src/play_controller.cpp
+++ b/src/play_controller.cpp
@@ -504,7 +504,7 @@ void play_controller::do_init_side(const unsigned int team_index){
 		game_events::fire("turn refresh");
 	}
 
-	const time_of_day &tod = status_.get_time_of_day();
+	const time_of_day &tod = tod_manager_.get_time_of_day();
 	current_team.set_time_of_day(int(turn()), tod);
 
 	if (int(team_index) + 1 == first_player_)