diff --git a/src/addon/info.hpp b/src/addon/info.hpp
index af06c2bf9a6f..2267a43de9f5 100644
--- a/src/addon/info.hpp
+++ b/src/addon/info.hpp
@@ -54,8 +54,8 @@ struct addon_info
 
 	std::string feedback_url;
 
-	time_t updated;
-	time_t created;
+	std::time_t updated;
+	std::time_t created;
 
 	// Artificial upload order index used to preserve add-ons upload order
 	// until we have actual first-upload timestamps implemented. This index
diff --git a/src/campaign_server/campaign_server.cpp b/src/campaign_server/campaign_server.cpp
index 0d0800890aa3..b99f5dd8a7f4 100644
--- a/src/campaign_server/campaign_server.cpp
+++ b/src/campaign_server/campaign_server.cpp
@@ -576,7 +576,7 @@ void server::handle_request_campaign_list(const server::request& req)
 {
 	LOG_CS << "sending campaign list to " << req.addr << " using gzip\n";
 
-	time_t epoch = time(nullptr);
+	std::time_t epoch = time(nullptr);
 	config campaign_list;
 
 	campaign_list["timestamp"] = epoch;
@@ -585,14 +585,14 @@ void server::handle_request_campaign_list(const server::request& req)
 	}
 
 	bool before_flag = false;
-	time_t before = epoch;
+	std::time_t before = epoch;
 	try {
 		before += req.cfg["before"].to_time_t();
 		before_flag = true;
 	} catch(const bad_lexical_cast&) {}
 
 	bool after_flag = false;
-	time_t after = epoch;
+	std::time_t after = epoch;
 	try {
 		after += req.cfg["after"].to_time_t();
 		after_flag = true;
@@ -825,7 +825,7 @@ void server::handle_upload(const server::request& req)
 		LOG_CS << "Upload denied - hidden add-on.\n";
 		send_error("Add-on upload denied. Please contact the server administration for assistance.", req.sock);
 	} else {
-		const time_t upload_ts = time(nullptr);
+		const std::time_t upload_ts = time(nullptr);
 
 		LOG_CS << "Upload is owner upload.\n";
 
diff --git a/src/chat_events.hpp b/src/chat_events.hpp
index 5cab83afd3ec..faf16b9bbe38 100644
--- a/src/chat_events.hpp
+++ b/src/chat_events.hpp
@@ -36,7 +36,7 @@ class chat_handler
 	void do_speak(const std::string& message, bool allies_only=false);
 
 	//called from do_speak
-	virtual void add_chat_message(const time_t& time,
+	virtual void add_chat_message(const std::time_t& time,
 			const std::string& speaker, int side, const std::string& message,
 			MESSAGE_TYPE type=MESSAGE_PRIVATE) = 0;
 	virtual void send_chat_message(const std::string& message, bool allies_only=false) = 0;
diff --git a/src/config_attribute_value.cpp b/src/config_attribute_value.cpp
index e7f06456159e..961ba389612d 100644
--- a/src/config_attribute_value.cpp
+++ b/src/config_attribute_value.cpp
@@ -296,9 +296,9 @@ std::size_t config_attribute_value::to_size_t(std::size_t def) const
 	return apply_visitor(attribute_numeric_visitor<std::size_t>(def));
 }
 
-time_t config_attribute_value::to_time_t(time_t def) const
+std::time_t config_attribute_value::to_time_t(std::time_t def) const
 {
-	return apply_visitor(attribute_numeric_visitor<time_t>(def));
+	return apply_visitor(attribute_numeric_visitor<std::time_t>(def));
 }
 
 double config_attribute_value::to_double(double def) const
diff --git a/src/config_attribute_value.hpp b/src/config_attribute_value.hpp
index 033feb1db378..f18909b1df80 100644
--- a/src/config_attribute_value.hpp
+++ b/src/config_attribute_value.hpp
@@ -153,7 +153,7 @@ class config_attribute_value
 	long long to_long_long(long long def = 0) const;
 	unsigned to_unsigned(unsigned def = 0) const;
 	std::size_t to_size_t(std::size_t def = 0) const;
-	time_t to_time_t(time_t def = 0) const;
+	std::time_t to_time_t(std::time_t def = 0) const;
 	double to_double(double def = 0.) const;
 	std::string str(const std::string& fallback = "") const;
 	t_string t_str() const;
diff --git a/src/display_chat_manager.cpp b/src/display_chat_manager.cpp
index 4b60dc99a4a9..1f050f3e36f6 100644
--- a/src/display_chat_manager.cpp
+++ b/src/display_chat_manager.cpp
@@ -43,7 +43,7 @@ display_chat_manager::chat_message::chat_message(int speaker, int h)
 {}
 
 
-void display_chat_manager::add_chat_message(const time_t& time, const std::string& speaker,
+void display_chat_manager::add_chat_message(const std::time_t& time, const std::string& speaker,
 		int side, const std::string& message, events::chat_handler::MESSAGE_TYPE type,
 		bool bell)
 {
diff --git a/src/display_chat_manager.hpp b/src/display_chat_manager.hpp
index 83b8f01217f6..26243dd77118 100644
--- a/src/display_chat_manager.hpp
+++ b/src/display_chat_manager.hpp
@@ -36,7 +36,7 @@ class display_chat_manager {
 	void remove_whisperer(const std::string& nick) { whisperers_.erase(nick); }
 	const std::set<std::string>& whisperers() const { return whisperers_; }
 
-	void add_chat_message(const time_t& time, const std::string& speaker,
+	void add_chat_message(const std::time_t& time, const std::string& speaker,
 		int side, const std::string& msg, events::chat_handler::MESSAGE_TYPE type, bool bell);
 	void clear_chat_messages() { prune_chat_messages(true); }
 
diff --git a/src/filesystem.cpp b/src/filesystem.cpp
index 583ee6a9bd5a..cac2624c2b05 100644
--- a/src/filesystem.cpp
+++ b/src/filesystem.cpp
@@ -991,7 +991,7 @@ bool file_exists(const std::string& name)
 	return file_exists(fs::path(name));
 }
 
-time_t file_modified_time(const std::string& fname)
+std::time_t file_modified_time(const std::string& fname)
 {
 	error_code ec;
 	auto mtime = fs::last_write_time(fs::path(fname), ec);
diff --git a/src/filesystem.hpp b/src/filesystem.hpp
index 4f0bb598ee43..e76fb35af42a 100644
--- a/src/filesystem.hpp
+++ b/src/filesystem.hpp
@@ -219,7 +219,7 @@ bool is_directory(const std::string& fname);
 bool file_exists(const std::string& name);
 
 /** Get the modification time of a file. */
-time_t file_modified_time(const std::string& fname);
+std::time_t file_modified_time(const std::string& fname);
 
 /** Returns true if the file ends with '.gz'. */
 bool is_gzip_file(const std::string& filename);
@@ -239,7 +239,7 @@ struct file_tree_checksum
 	void reset() {nfiles = 0;modified = 0;sum_size=0;}
 	// @todo make variables private!
 	std::size_t nfiles, sum_size;
-	time_t modified;
+	std::time_t modified;
 	bool operator==(const file_tree_checksum &rhs) const;
 	bool operator!=(const file_tree_checksum &rhs) const
 	{ return !operator==(rhs); }
diff --git a/src/format_time_summary.cpp b/src/format_time_summary.cpp
index 4298b35b6670..90aa11b252fb 100644
--- a/src/format_time_summary.cpp
+++ b/src/format_time_summary.cpp
@@ -20,8 +20,8 @@
 
 namespace utils {
 
-std::string format_time_summary(time_t t) {
-	time_t curtime = time(nullptr);
+std::string format_time_summary(std::time_t t) {
+	std::time_t curtime = time(nullptr);
 	const struct tm* timeptr = localtime(&curtime);
 	if(timeptr == nullptr) {
 		return "";
diff --git a/src/format_time_summary.hpp b/src/format_time_summary.hpp
index 5cec26280090..1cc1d60639ee 100644
--- a/src/format_time_summary.hpp
+++ b/src/format_time_summary.hpp
@@ -18,5 +18,5 @@
 #include <string>
 
 namespace utils {
-	std::string format_time_summary(time_t t);
+	std::string format_time_summary(std::time_t t);
 }
diff --git a/src/game_initialization/lobby_data.cpp b/src/game_initialization/lobby_data.cpp
index 1e9ca910fe79..f628e2b2c2ac 100644
--- a/src/game_initialization/lobby_data.cpp
+++ b/src/game_initialization/lobby_data.cpp
@@ -46,7 +46,7 @@ static lg::log_domain log_lobby("lobby");
 
 namespace mp {
 
-chat_message::chat_message(const time_t& timestamp,
+chat_message::chat_message(const std::time_t& timestamp,
 						   const std::string& user,
 						   const std::string& message)
 	: timestamp(timestamp), user(user), message(message)
@@ -57,7 +57,7 @@ chat_session::chat_session() : history_()
 {
 }
 
-void chat_session::add_message(const time_t& timestamp,
+void chat_session::add_message(const std::time_t& timestamp,
 						   const std::string& user,
 						   const std::string& message)
 {
diff --git a/src/game_initialization/lobby_data.hpp b/src/game_initialization/lobby_data.hpp
index aba2efa67481..b47568cfa214 100644
--- a/src/game_initialization/lobby_data.hpp
+++ b/src/game_initialization/lobby_data.hpp
@@ -14,6 +14,7 @@
 
 #pragma once
 
+#include <ctime>
 #include <set>
 #include <deque>
 #include <functional>
@@ -28,11 +29,11 @@ namespace mp {
 struct chat_message
 {
 	/** Create a chat message */
-	chat_message(const time_t& timestamp,
+	chat_message(const std::time_t& timestamp,
 				 const std::string& user,
 				 const std::string& message);
 
-	time_t timestamp;
+	std::time_t timestamp;
 	std::string user;
 	std::string message;
 };
@@ -43,7 +44,7 @@ class chat_session
 public:
 	chat_session();
 
-	void add_message(const time_t& timestamp,
+	void add_message(const std::time_t& timestamp,
 					 const std::string& user,
 					 const std::string& message);
 
diff --git a/src/gui/dialogs/addon/manager.cpp b/src/gui/dialogs/addon/manager.cpp
index af9161459e35..0cfe90d5537c 100644
--- a/src/gui/dialogs/addon/manager.cpp
+++ b/src/gui/dialogs/addon/manager.cpp
@@ -831,7 +831,7 @@ void addon_manager::copy_url_callback(text_box& url_box)
 	desktop::clipboard::copy_to_clipboard(url_box.get_value(), false);
 }
 
-static std::string format_addon_time(time_t time)
+static std::string format_addon_time(std::time_t time)
 {
 	if(time) {
 		std::ostringstream ss;
diff --git a/src/gui/dialogs/debug_clock.cpp b/src/gui/dialogs/debug_clock.cpp
index a2bedb212e93..86c9d7f3bb73 100644
--- a/src/gui/dialogs/debug_clock.cpp
+++ b/src/gui/dialogs/debug_clock.cpp
@@ -173,7 +173,7 @@ debug_clock::time::time() : hour(0), minute(0), second(0), millisecond(0)
 
 void debug_clock::time::set_current_time()
 {
-	time_t now = ::time(nullptr);
+	std::time_t now = ::time(nullptr);
 	tm* stamp = localtime(&now);
 
 	hour = stamp->tm_hour;
diff --git a/src/gui/widgets/chatbox.cpp b/src/gui/widgets/chatbox.cpp
index 04015bd98c69..0ec12a127ed2 100644
--- a/src/gui/widgets/chatbox.cpp
+++ b/src/gui/widgets/chatbox.cpp
@@ -256,7 +256,7 @@ void chatbox::user_relation_changed(const std::string& /*name*/)
 	}
 }
 
-void chatbox::add_chat_message(const time_t& /*time*/,
+void chatbox::add_chat_message(const std::time_t& /*time*/,
 	const std::string& speaker,
 	int /*side*/,
 	const std::string& message,
diff --git a/src/gui/widgets/chatbox.hpp b/src/gui/widgets/chatbox.hpp
index fcff9b2bf738..db5466899127 100644
--- a/src/gui/widgets/chatbox.hpp
+++ b/src/gui/widgets/chatbox.hpp
@@ -107,7 +107,7 @@ class chatbox : public container_base, public events::chat_handler
 	virtual void user_relation_changed(const std::string& name) override;
 
 	/** Inherited form @ref chat_handler */
-	virtual void add_chat_message(const time_t& time,
+	virtual void add_chat_message(const std::time_t& time,
 		const std::string& speaker,
 		int side,
 		const std::string& message,
diff --git a/src/gui/widgets/debug.cpp b/src/gui/widgets/debug.cpp
index 7cb6a48cfd14..8ab7d7f1dbe3 100644
--- a/src/gui/widgets/debug.cpp
+++ b/src/gui/widgets/debug.cpp
@@ -84,7 +84,7 @@ std::string get_base_filename()
 {
 	std::ostringstream ss;
 
-	time_t t = time(nullptr);
+	std::time_t t = time(nullptr);
 	ss << std::put_time(std::localtime(&t), "%Y%m%d_%H%M%S");
 
 	static unsigned counter = 0;
diff --git a/src/log.cpp b/src/log.cpp
index 2b5a8bd2dd52..83923cc3723f 100644
--- a/src/log.cpp
+++ b/src/log.cpp
@@ -172,18 +172,18 @@ bool broke_strict() {
 	return strict_threw_;
 }
 
-std::string get_timestamp(const time_t& t, const std::string& format) {
+std::string get_timestamp(const std::time_t& t, const std::string& format) {
 	std::ostringstream ss;
 
 	ss << std::put_time(std::localtime(&t), format.c_str());
 
 	return ss.str();
 }
-std::string get_timespan(const time_t& t) {
+std::string get_timespan(const std::time_t& t) {
 	std::ostringstream sout;
 	// There doesn't seem to be any library function for this
-	const time_t minutes = t / 60;
-	const time_t days = minutes / 60 / 24;
+	const std::time_t minutes = t / 60;
+	const std::time_t days = minutes / 60 / 24;
 	if(t <= 0) {
 		sout << "expired";
 	} else if(minutes == 0) {
diff --git a/src/log.hpp b/src/log.hpp
index 36661e955e62..847ecd04ff45 100644
--- a/src/log.hpp
+++ b/src/log.hpp
@@ -138,8 +138,8 @@ class logger {
 
 void timestamps(bool);
 void precise_timestamps(bool);
-std::string get_timestamp(const time_t& t, const std::string& format="%Y%m%d %H:%M:%S ");
-std::string get_timespan(const time_t& t);
+std::string get_timestamp(const std::time_t& t, const std::string& format="%Y%m%d %H:%M:%S ");
+std::string get_timespan(const std::time_t& t);
 
 logger &err(), &warn(), &info(), &debug();
 log_domain& general();
diff --git a/src/log_windows.cpp b/src/log_windows.cpp
index 050aa41ac6bb..6534adaa862a 100644
--- a/src/log_windows.cpp
+++ b/src/log_windows.cpp
@@ -109,7 +109,7 @@ std::string unique_log_filename()
 
 	o << log_file_prefix;
 
-	const time_t cur = time(nullptr);
+	const std::time_t cur = time(nullptr);
 	o << std::put_time(std::localtime(&cur), "%Y%m%d-%H%M%S-");
 
 	o << GetCurrentProcessId() << log_file_suffix;
diff --git a/src/menu_events.cpp b/src/menu_events.cpp
index 471f6d05cb6e..438fd12a7681 100644
--- a/src/menu_events.cpp
+++ b/src/menu_events.cpp
@@ -1012,7 +1012,7 @@ void menu_handler::do_speak(const std::string& message)
 	chat_handler::do_speak(message, false);
 }
 
-void menu_handler::add_chat_message(const time_t& time,
+void menu_handler::add_chat_message(const std::time_t& time,
 		const std::string& speaker,
 		int side,
 		const std::string& message,
@@ -1273,7 +1273,7 @@ void menu_handler::send_chat_message(const std::string& message, bool allies_onl
 	config cfg;
 	cfg["id"] = preferences::login();
 	cfg["message"] = message;
-	const time_t time = ::time(nullptr);
+	const std::time_t time = ::time(nullptr);
 	std::stringstream ss;
 	ss << time;
 	cfg["time"] = ss.str();
diff --git a/src/menu_events.hpp b/src/menu_events.hpp
index daf20fd7966e..ca5dd6f3e002 100644
--- a/src/menu_events.hpp
+++ b/src/menu_events.hpp
@@ -123,7 +123,7 @@ class menu_handler : private chat_handler
 	const gamemap& map() const;
 
 protected:
-	void add_chat_message(const time_t& time,
+	void add_chat_message(const std::time_t& time,
 			const std::string& speaker,
 			int side,
 			const std::string& message,
diff --git a/src/preferences/game.cpp b/src/preferences/game.cpp
index 73e209906d65..e60dbfbbab11 100644
--- a/src/preferences/game.cpp
+++ b/src/preferences/game.cpp
@@ -890,7 +890,7 @@ compression::format save_compression_format()
 	return compression::GZIP;
 }
 
-std::string get_chat_timestamp(const time_t& t) {
+std::string get_chat_timestamp(const std::time_t& t) {
 	if (chat_timestamping()) {
 		if(preferences::use_twelve_hour_clock_format() == false) {
 			return lg::get_timestamp(t, _("[%H:%M]")) + " ";
diff --git a/src/preferences/game.hpp b/src/preferences/game.hpp
index bbac870ddcb0..02e855ab49e8 100644
--- a/src/preferences/game.hpp
+++ b/src/preferences/game.hpp
@@ -199,7 +199,7 @@ class acquaintance;
 
 
 	// Multiplayer functions
-	std::string get_chat_timestamp(const time_t& t);
+	std::string get_chat_timestamp(const std::time_t& t);
 	bool chat_timestamping();
 	void set_chat_timestamping(bool value);
 
diff --git a/src/replay.cpp b/src/replay.cpp
index 9a9c5754b9f4..ce3e44b61a34 100644
--- a/src/replay.cpp
+++ b/src/replay.cpp
@@ -124,9 +124,9 @@ static void verify(const unit_map& units, const config& cfg) {
 	LOG_REPLAY << "verification passed\n";
 }
 
-static time_t get_time(const config &speak)
+static std::time_t get_time(const config &speak)
 {
-	time_t time;
+	std::time_t time;
 	if (!speak["time"].empty())
 	{
 		std::stringstream ss(speak["time"].str());
diff --git a/src/replay.hpp b/src/replay.hpp
index 0bf81adf56fa..71dd35eab5f8 100644
--- a/src/replay.hpp
+++ b/src/replay.hpp
@@ -21,6 +21,7 @@
 
 #include "map/location.hpp"
 
+#include <ctime>
 #include <deque>
 #include <iterator>
 #include <map>
@@ -35,14 +36,14 @@ class chat_msg {
 	const std::string &text() const { return text_; }
 	const std::string &nick() const { return nick_; }
 	const std::string &color() const { return color_; }
-	const time_t &time() const { return time_; }
+	const std::time_t &time() const { return time_; }
 	chat_msg(const config &cfg);
 	virtual ~chat_msg();
 private:
 	std::string color_;
 	std::string nick_;
 	std::string text_;
-	time_t time_;
+	std::time_t time_;
 };
 
 class replay
diff --git a/src/reports.cpp b/src/reports.cpp
index 250d8bc41ea5..b8f94a4e6d52 100644
--- a/src/reports.cpp
+++ b/src/reports.cpp
@@ -1534,7 +1534,7 @@ REPORT_GENERATOR(report_clock, /*rc*/)
 		? "%I:%M %p"
 		: "%H:%M";
 
-	time_t t = std::time(nullptr);
+	std::time_t t = std::time(nullptr);
 	ss << std::put_time(std::localtime(&t), format);
 
 	return text_report(ss.str(), _("Clock"));
diff --git a/src/save_index.cpp b/src/save_index.cpp
index 58181e6cf88f..59aa941ff8ba 100644
--- a/src/save_index.cpp
+++ b/src/save_index.cpp
@@ -43,11 +43,11 @@ void extract_summary_from_config(config&, config&);
 
 void save_index_class::rebuild(const std::string& name)
 {
-	time_t modified = filesystem::file_modified_time(filesystem::get_saves_dir() + "/" + name);
+	std::time_t modified = filesystem::file_modified_time(filesystem::get_saves_dir() + "/" + name);
 	rebuild(name, modified);
 }
 
-void save_index_class::rebuild(const std::string& name, const time_t& modified)
+void save_index_class::rebuild(const std::string& name, const std::time_t& modified)
 {
 	log_scope("load_summary_from_file");
 
@@ -74,7 +74,7 @@ void save_index_class::remove(const std::string& name)
 	write_save_index();
 }
 
-void save_index_class::set_modified(const std::string& name, const time_t& modified)
+void save_index_class::set_modified(const std::string& name, const std::time_t& modified)
 {
 	modified_[name] = modified;
 }
@@ -82,7 +82,7 @@ void save_index_class::set_modified(const std::string& name, const time_t& modif
 config& save_index_class::get(const std::string& name)
 {
 	config& result = data(name);
-	time_t m = modified_[name];
+	std::time_t m = modified_[name];
 
 	config::attribute_value& mod_time = result["mod_time"];
 	if(mod_time.empty() || mod_time.to_time_t() != m) {
@@ -227,7 +227,7 @@ std::string save_info::format_time_local() const
 
 std::string save_info::format_time_summary() const
 {
-	time_t t = modified();
+	std::time_t t = modified();
 	return utils::format_time_summary(t);
 }
 
@@ -340,7 +340,7 @@ create_save_info::create_save_info(const std::string* d)
 
 save_info create_save_info::operator()(const std::string& filename) const
 {
-	time_t modified = filesystem::file_modified_time(dir + "/" + filename);
+	std::time_t modified = filesystem::file_modified_time(dir + "/" + filename);
 	save_index_manager.set_modified(filename, modified);
 	return save_info(filename, modified);
 }
diff --git a/src/save_index.hpp b/src/save_index.hpp
index a1e320baf8fd..d1ca757cd5e3 100644
--- a/src/save_index.hpp
+++ b/src/save_index.hpp
@@ -26,7 +26,7 @@ class save_info
 private:
 	friend class create_save_info;
 
-	save_info(const std::string& name, const time_t& modified)
+	save_info(const std::string& name, const std::time_t& modified)
 		: name_(name)
 		, modified_(modified)
 	{
@@ -38,7 +38,7 @@ class save_info
 		return name_;
 	}
 
-	const time_t& modified() const
+	const std::time_t& modified() const
 	{
 		return modified_;
 	}
@@ -49,7 +49,7 @@ class save_info
 
 private:
 	std::string name_;
-	time_t modified_;
+	std::time_t modified_;
 };
 
 /**
@@ -86,10 +86,10 @@ class save_index_class
 	save_index_class();
 
 	void rebuild(const std::string& name);
-	void rebuild(const std::string& name, const time_t& modified);
+	void rebuild(const std::string& name, const std::time_t& modified);
 
 	void remove(const std::string& name);
-	void set_modified(const std::string& name, const time_t& modified);
+	void set_modified(const std::string& name, const std::time_t& modified);
 
 	config& get(const std::string& name);
 
@@ -103,7 +103,7 @@ class save_index_class
 
 	bool loaded_;
 	config data_;
-	std::map<std::string, time_t> modified_;
+	std::map<std::string, std::time_t> modified_;
 };
 
 extern save_index_class save_index_manager;
diff --git a/src/server/ban.cpp b/src/server/ban.cpp
index c19f93ce0a8d..edc2351c2f9d 100644
--- a/src/server/ban.cpp
+++ b/src/server/ban.cpp
@@ -85,7 +85,7 @@ static lg::log_domain log_server("server");
 	}
 
 	banned::banned(const std::string& ip,
-				   const time_t end_time,
+				   const std::time_t end_time,
 				   const std::string& reason,
 				   const std::string& who_banned,
 				   const std::string& group,
@@ -324,7 +324,7 @@ static lg::log_domain log_server("server");
 		writer.write(cfg);
 	}
 
-	bool ban_manager::parse_time(const std::string& duration, time_t* time) const
+	bool ban_manager::parse_time(const std::string& duration, std::time_t* time) const
 	{
 		if (!time) return false;
 
@@ -489,7 +489,7 @@ static lg::log_domain log_server("server");
 	}
 
 	std::string ban_manager::ban(const std::string& ip,
-								 const time_t& end_time,
+								 const std::time_t& end_time,
 								 const std::string& reason,
 								 const std::string& who_banned,
 								 const std::string& group,
@@ -562,7 +562,7 @@ static lg::log_domain log_server("server");
 		write();
 	}
 
-	void ban_manager::check_ban_times(time_t time_now)
+	void ban_manager::check_ban_times(std::time_t time_now)
 	{
 		while (!time_queue_.empty())
 		{
@@ -704,7 +704,7 @@ static lg::log_domain log_server("server");
 	{
 		ban_times_.clear();
 		for (const config &bt : cfg.child_range("ban_time")) {
-			time_t duration = 0;
+			std::time_t duration = 0;
 			if (parse_time(bt["time"], &duration)) {
 				ban_times_.emplace(bt["name"], duration);
 			}
diff --git a/src/server/ban.hpp b/src/server/ban.hpp
index 7fb8df150b6f..5139015d7590 100644
--- a/src/server/ban.hpp
+++ b/src/server/ban.hpp
@@ -57,8 +57,8 @@ namespace wesnothd {
 		unsigned int ip_;
 		unsigned int mask_;
 		std::string ip_text_;
-		time_t end_time_;
-		time_t start_time_;
+		std::time_t end_time_;
+		std::time_t start_time_;
 		std::string reason_;
 		std::string who_banned_;
 		std::string group_;
@@ -68,19 +68,19 @@ namespace wesnothd {
 		banned(const std::string& ip);
 
 	public:
-		banned(const std::string& ip, const time_t end_time, const std::string& reason, const std::string& who_banned=who_banned_default_, const std::string& group="", const std::string& nick="");
+		banned(const std::string& ip, const std::time_t end_time, const std::string& reason, const std::string& who_banned=who_banned_default_, const std::string& group="", const std::string& nick="");
 		banned(const config&);
 
 		void read(const config&);
 		void write(config&) const;
 
-		time_t get_end_time() const
+		std::time_t get_end_time() const
 		{ return end_time_;	}
 
 		std::string get_human_end_time() const;
 		std::string get_human_start_time() const;
 		std::string get_human_time_span() const;
-		static std::string get_human_time(const time_t&);
+		static std::string get_human_time(const std::time_t&);
 
 		std::string get_reason() const
 		{ return reason_; }
@@ -135,7 +135,7 @@ namespace wesnothd {
 		{ return c - '0'; }
 
 		void init_ban_help();
-		void check_ban_times(time_t time_now);
+		void check_ban_times(std::time_t time_now);
 		inline void expire_bans() {
 			check_ban_times(time(nullptr));
 		}
@@ -152,9 +152,9 @@ namespace wesnothd {
 		 * @returns false if an invalid time modifier is encountered.
 		 * *time is undefined in that case.
 		 */
-		bool parse_time(const std::string& duration, time_t* time) const;
+		bool parse_time(const std::string& duration, std::time_t* time) const;
 
-		std::string ban(const std::string&, const time_t&, const std::string&, const std::string&, const std::string&, const std::string& = "");
+		std::string ban(const std::string&, const std::time_t&, const std::string&, const std::string&, const std::string&, const std::string& = "");
 		void unban(std::ostringstream& os, const std::string& ip, bool immediate_write=true);
 		void unban_group(std::ostringstream& os, const std::string& group);
 
diff --git a/src/server/forum_user_handler.cpp b/src/server/forum_user_handler.cpp
index 30a86d478e63..427ce84f8179 100644
--- a/src/server/forum_user_handler.cpp
+++ b/src/server/forum_user_handler.cpp
@@ -220,8 +220,8 @@ std::string fuh::user_info(const std::string& name) {
 		throw error("No user with the name '" + name + "' exists.");
 	}
 
-	time_t reg_date = get_registrationdate(name);
-	time_t ll_date = get_lastlogin(name);
+	std::time_t reg_date = get_registrationdate(name);
+	std::time_t ll_date = get_lastlogin(name);
 
 	std::string reg_string = ctime(&reg_date);
 	std::string ll_string;
@@ -269,27 +269,27 @@ std::string fuh::get_mail(const std::string& user) {
 	}
 }
 
-time_t fuh::get_lastlogin(const std::string& user) {
+std::time_t fuh::get_lastlogin(const std::string& user) {
 	try {
 		int time_int = get_writable_detail_for_user<int>(user, "user_lastvisit");
-		return time_t(time_int);
+		return std::time_t(time_int);
 	} catch (const sql_error& e) {
 		ERR_UH << "Could not retrieve last visit for user '" << user << "' :" << e.message << std::endl;
-		return time_t(0);
+		return std::time_t(0);
 	}
 }
 
-time_t fuh::get_registrationdate(const std::string& user) {
+std::time_t fuh::get_registrationdate(const std::string& user) {
 	try {
 		int time_int = get_detail_for_user<int>(user, "user_regdate");
-		return time_t(time_int);
+		return std::time_t(time_int);
 	} catch (const sql_error& e) {
 		ERR_UH << "Could not retrieve registration date for user '" << user << "' :" << e.message << std::endl;
-		return time_t(0);
+		return std::time_t(0);
 	}
 }
 
-void fuh::set_lastlogin(const std::string& user, const time_t& lastlogin) {
+void fuh::set_lastlogin(const std::string& user, const std::time_t& lastlogin) {
 
 	try {
 		write_detail(user, "user_lastvisit", int(lastlogin));
diff --git a/src/server/forum_user_handler.hpp b/src/server/forum_user_handler.hpp
index 5e23e5ef7fc2..023a58efa308 100644
--- a/src/server/forum_user_handler.hpp
+++ b/src/server/forum_user_handler.hpp
@@ -85,11 +85,11 @@ class fuh : public user_handler {
 		std::string get_mail(const std::string& user);
 		/*std::vector<std::string> get_friends(const std::string& user);
 		std::vector<std::string> get_ignores(const std::string& user);*/
-		time_t get_lastlogin(const std::string& user);
-		time_t get_registrationdate(const std::string& user);
+		std::time_t get_lastlogin(const std::string& user);
+		std::time_t get_registrationdate(const std::string& user);
 		bool is_inactive(const std::string& user);
 
-		void set_lastlogin(const std::string& user, const time_t& lastlogin);
+		void set_lastlogin(const std::string& user, const std::time_t& lastlogin);
 
 		std::string db_name_, db_host_, db_user_, db_password_, db_users_table_, db_banlist_table_, db_extra_table_;
 
diff --git a/src/server/metrics.cpp b/src/server/metrics.cpp
index 74542a193876..0b3066df6d35 100644
--- a/src/server/metrics.cpp
+++ b/src/server/metrics.cpp
@@ -150,7 +150,7 @@ std::ostream& metrics::requests(std::ostream& out) const
 
 std::ostream& operator<<(std::ostream& out, metrics& met)
 {
-	const time_t time_up = time(nullptr) - met.started_at_;
+	const std::time_t time_up = time(nullptr) - met.started_at_;
 	const int seconds = time_up%60;
 	const int minutes = (time_up/60)%60;
 	const int hours = (time_up/(60*60))%24;
diff --git a/src/server/metrics.hpp b/src/server/metrics.hpp
index 5b8f66155a81..6f155f8354f4 100644
--- a/src/server/metrics.hpp
+++ b/src/server/metrics.hpp
@@ -72,7 +72,7 @@ class metrics
 	int current_requests_;
 	int nrequests_;
 	int nrequests_waited_;
-	const time_t started_at_;
+	const std::time_t started_at_;
 	std::map<std::string,int> terminations_;
 };
 
diff --git a/src/server/player.cpp b/src/server/player.cpp
index a91b3ceed945..b666996f7d8f 100644
--- a/src/server/player.cpp
+++ b/src/server/player.cpp
@@ -76,7 +76,7 @@ void wesnothd::player::mark_registered(bool registered)
 
 bool wesnothd::player::is_message_flooding()
 {
-	const time_t now = time(nullptr);
+	const std::time_t now = time(nullptr);
 	if (flood_start_ == 0) {
 		flood_start_ = now;
 		return false;
diff --git a/src/server/player.hpp b/src/server/player.hpp
index 45f1cc392580..b6f4fd2d19dc 100644
--- a/src/server/player.hpp
+++ b/src/server/player.hpp
@@ -73,10 +73,10 @@ class player
 
 	bool registered_;
 
-	time_t flood_start_;
+	std::time_t flood_start_;
 	unsigned int messages_since_flood_start_;
 	const std::size_t MaxMessages;
-	const time_t TimePeriod;
+	const std::time_t TimePeriod;
 	STATUS status_;
 	bool moderator_;
 };
diff --git a/src/server/sample_user_handler.cpp b/src/server/sample_user_handler.cpp
index 4b14ccb70931..dd5796af7aa4 100644
--- a/src/server/sample_user_handler.cpp
+++ b/src/server/sample_user_handler.cpp
@@ -119,7 +119,7 @@ void suh::set_realname(const std::string& user, const std::string& realname) {
 // set_lastlogin() is not called by the server via set_user_detail()
 // and thus must not throw user_handler::error
 
-void suh::set_lastlogin(const std::string& user, const time_t& lastlogin) {
+void suh::set_lastlogin(const std::string& user, const std::time_t& lastlogin) {
 	users_[user].lastlogin = lastlogin;
 }
 
@@ -137,11 +137,11 @@ std::string suh::get_realname(const std::string& user) {
 	return users_[user].realname;
 }
 
-time_t suh::get_lastlogin(const std::string& user) {
+std::time_t suh::get_lastlogin(const std::string& user) {
 	return users_[user].lastlogin;
 }
 
-time_t suh::get_registrationdate(const std::string& user) {
+std::time_t suh::get_registrationdate(const std::string& user) {
 	return users_[user].registrationdate;
 }
 
@@ -185,11 +185,11 @@ void suh::clean_up() {
 		return;
 	}
 
-	time_t now = time(nullptr);
+	std::time_t now = time(nullptr);
 
 	//A minute has 60 seconds, an hour 60 minutes and
 	//a day 24 hours.
-	time_t limit = user_expiration_ * 60 * 60 * 24;
+	std::time_t limit = user_expiration_ * 60 * 60 * 24;
 
 	std::vector<std::string> us = users();
 	for(std::vector<std::string>::const_iterator u = us.begin(); u != us.end(); ++u) {
@@ -211,8 +211,8 @@ void suh::user_logged_in(const std::string& name) {
 std::string suh::user_info(const std::string& name) {
 	if(!user_exists(name)) throw error("No user with the name '" + name + "' exists.");
 
-	time_t reg_date = get_registrationdate(name);
-	time_t ll_date = get_lastlogin(name);
+	std::time_t reg_date = get_registrationdate(name);
+	std::time_t ll_date = get_lastlogin(name);
 
 	std::string reg_string = ctime(&reg_date);
 	std::string ll_string;
diff --git a/src/server/sample_user_handler.hpp b/src/server/sample_user_handler.hpp
index 744e23a7f781..43e132683ceb 100644
--- a/src/server/sample_user_handler.hpp
+++ b/src/server/sample_user_handler.hpp
@@ -58,8 +58,8 @@ class suh : public user_handler {
 			std::string password;
 			std::string realname;
 			std::string mail;
-			time_t lastlogin;
-			time_t registrationdate;
+			std::time_t lastlogin;
+			std::time_t registrationdate;
 			bool is_moderator;
 		};
 
@@ -73,8 +73,8 @@ class suh : public user_handler {
 		std::string get_mail(const std::string& user);
 		std::string get_password(const std::string& user);
 		std::string get_realname(const std::string& user) ;
-		time_t get_lastlogin(const std::string& user);
-		time_t get_registrationdate(const std::string& user);
+		std::time_t get_lastlogin(const std::string& user);
+		std::time_t get_registrationdate(const std::string& user);
 
 		void check_name(const std::string& name);
 		void check_mail(const std::string& mail);
@@ -85,7 +85,7 @@ class suh : public user_handler {
 		void set_password(const std::string& user, const std::string& password);
 		void set_realname(const std::string& user, const std::string& realname);
 
-		void set_lastlogin(const std::string& user, const time_t& lastlogin);
+		void set_lastlogin(const std::string& user, const std::time_t& lastlogin);
 
 		int user_expiration_;
 
diff --git a/src/server/server.cpp b/src/server/server.cpp
index 54303e3ba457..56826e533781 100644
--- a/src/server/server.cpp
+++ b/src/server/server.cpp
@@ -504,14 +504,14 @@ std::string server::is_ip_banned(const std::string& ip) {
 	return ban_manager_.is_ip_banned(ip);
 }
 
-void server::dump_stats(const time_t& now) {
+void server::dump_stats(const std::time_t& now) {
 	last_stats_ = now;
 	LOG_SERVER << "Statistics:"
 			   << "\tnumber_of_games = " << games().size()
 			   << "\tnumber_of_users = " << player_connections_.size() << "\n";
 }
 
-void server::clean_user_handler(const time_t& now) {
+void server::clean_user_handler(const std::time_t& now) {
 	if(!user_handler_) {
 		return;
 	}
@@ -782,7 +782,7 @@ bool server::authenticate(socket_ptr socket, const std::string& username, const
 			}
 			// This name is registered and an incorrect password provided
 			else if(!(user_handler_->login(username, password, seeds_[reinterpret_cast<unsigned long>(socket.get())]))) {
-				const time_t now = time(nullptr);
+				const std::time_t now = time(nullptr);
 
 				// Reset the random seed
 				seeds_.erase(reinterpret_cast<unsigned long>(socket.get()));
@@ -1812,7 +1812,7 @@ void server::send_server_message_to_all(const std::string& message, socket_ptr e
 				}
 			}
 
-			time_t now = time(nullptr);
+			std::time_t now = time(nullptr);
 			if (last_ping_ + network::ping_interval <= now) {
 				if (lan_server_ && players_.empty() && last_user_seen_time_ + lan_server_ < now)
 				{
@@ -2432,7 +2432,7 @@ void server::ban_handler(const std::string& issuer_name, const std::string& /*qu
 	const std::string target(parameters.begin(), first_space);
 
 	const std::string duration(first_space + 1, second_space);
-	time_t parsed_time = time(nullptr);
+	std::time_t parsed_time = time(nullptr);
 	if (ban_manager_.parse_time(duration, &parsed_time) == false) {
 		*out << "Failed to parse the ban duration: '" << duration << "'\n"
 			 << ban_manager_.get_ban_help();
@@ -2500,7 +2500,7 @@ void server::kickban_handler(const std::string& issuer_name, const std::string&
 	std::string::iterator second_space = std::find(first_space + 1, parameters.end(), ' ');
 	const std::string target(parameters.begin(), first_space);
 	const std::string duration(first_space + 1, second_space);
-	time_t parsed_time = time(nullptr);
+	std::time_t parsed_time = time(nullptr);
 	if (ban_manager_.parse_time(duration, &parsed_time) == false) {
 		*out << "Failed to parse the ban duration: '" << duration << "'\n"
 			 << ban_manager_.get_ban_help();
@@ -2589,7 +2589,7 @@ void server::gban_handler(const std::string& issuer_name, const std::string& /*q
 	second_space = std::find(first_space + 1, parameters.end(), ' ');
 
 	const std::string duration(first_space + 1, second_space);
-	time_t parsed_time = time(nullptr);
+	std::time_t parsed_time = time(nullptr);
 	if (ban_manager_.parse_time(duration, &parsed_time) == false) {
 		*out << "Failed to parse the ban duration: '" << duration << "'\n"
 			 << ban_manager_.get_ban_help();
diff --git a/src/server/server.hpp b/src/server/server.hpp
index de2689676721..10dc8f94df6d 100644
--- a/src/server/server.hpp
+++ b/src/server/server.hpp
@@ -74,10 +74,10 @@ class server : public server_base
 	wesnothd::ban_manager ban_manager_;
 
 	struct connection_log {
-		connection_log(std::string _nick, std::string _ip, time_t _log_off) :
+		connection_log(std::string _nick, std::string _ip, std::time_t _log_off) :
 			nick(_nick), ip(_ip), log_off(_log_off) {}
 		std::string nick, ip;
-		time_t log_off;
+		std::time_t log_off;
 
 		bool operator==(const connection_log& c) const
 		{
@@ -89,11 +89,11 @@ class server : public server_base
 	std::deque<connection_log> ip_log_;
 
 	struct login_log {
-		login_log(std::string _ip, int _attempts, time_t _first_attempt) :
+		login_log(std::string _ip, int _attempts, std::time_t _first_attempt) :
 			ip(_ip), attempts(_attempts), first_attempt(_first_attempt) {}
 		std::string ip;
 		int attempts;
-		time_t first_attempt;
+		std::time_t first_attempt;
 
 		bool operator==(const login_log& l) const
 		{
@@ -140,8 +140,8 @@ class server : public server_base
 	std::size_t default_time_period_;
 	std::size_t concurrent_connections_;
 	bool graceful_restart;
-	time_t lan_server_;
-	time_t last_user_seen_time_;
+	std::time_t lan_server_;
+	std::time_t last_user_seen_time_;
 	std::string restart_command;
 	std::size_t max_ip_log_size_;
 	std::string uh_name_;
@@ -151,7 +151,7 @@ class server : public server_base
 	bool allow_remote_shutdown_;
 	std::vector<std::string> tor_ip_list_;
 	int failed_login_limit_;
-	time_t failed_login_ban_;
+	std::time_t failed_login_ban_;
 	std::deque<login_log>::size_type failed_login_buffer_size_;
 
 	/** Parse the server config into local variables. */
@@ -167,12 +167,12 @@ class server : public server_base
 
 	metrics metrics_;
 
-	time_t last_ping_;
-	time_t last_stats_;
-	void dump_stats(const time_t& now);
+	std::time_t last_ping_;
+	std::time_t last_stats_;
+	void dump_stats(const std::time_t& now);
 
-	time_t last_uh_clean_;
-	void clean_user_handler(const time_t& now);
+	std::time_t last_uh_clean_;
+	void clean_user_handler(const std::time_t& now);
 
 	/** Process commands from admins and users. */
 	std::string process_command(std::string cmd, std::string issuer_name);
diff --git a/src/tests/gui/test_gui2.cpp b/src/tests/gui/test_gui2.cpp
index 0b9553fa4af8..2fe06d8f1cc9 100644
--- a/src/tests/gui/test_gui2.cpp
+++ b/src/tests/gui/test_gui2.cpp
@@ -868,7 +868,7 @@ struct dialog_tester<mp_lobby>
 };
 
 class fake_chat_handler : public events::chat_handler {
-	void add_chat_message(const time_t&,
+	void add_chat_message(const std::time_t&,
 		const std::string&, int, const std::string&,
 		MESSAGE_TYPE) {}
 	void send_chat_message(const std::string&, bool) {}
diff --git a/src/wesnoth.cpp b/src/wesnoth.cpp
index d88da88f1132..125e0b37f7eb 100644
--- a/src/wesnoth.cpp
+++ b/src/wesnoth.cpp
@@ -91,7 +91,7 @@
 #include <clocale>   // for setlocale, LC_ALL, etc
 #include <cstdio>    // for remove, fprintf, stderr
 #include <cstdlib>   // for srand, exit
-#include <ctime>     // for time, ctime, time_t
+#include <ctime>     // for time, ctime, std::time_t
 #include <exception> // for exception
 #include <fstream>   // for operator<<, basic_ostream, etc
 #include <iostream>  // for cerr, cout
@@ -1033,7 +1033,7 @@ int main(int argc, char** argv)
 
 	try {
 		std::cerr << "Battle for Wesnoth v" << game_config::revision << '\n';
-		const time_t t = time(nullptr);
+		const std::time_t t = time(nullptr);
 		std::cerr << "Started on " << ctime(&t) << "\n";
 
 		const std::string& exe_dir = filesystem::get_exe_dir();