diff --git a/src/chat_command_handler.cpp b/src/chat_command_handler.cpp
index 0d61f833171d..f0dbee4d98dd 100644
--- a/src/chat_command_handler.cpp
+++ b/src/chat_command_handler.cpp
@@ -11,13 +11,14 @@
    See the COPYING file for more details.
 */
 
-#include "gui/dialogs/preferences_dialog.hpp"
-#include "map_command_handler.hpp"
 #include "chat_command_handler.hpp"
+
 #include "chat_events.hpp"
-#include "preferences/game.hpp"
+#include "game_version.hpp"
+#include "gui/dialogs/preferences_dialog.hpp"
+#include "map_command_handler.hpp"
 #include "preferences/display.hpp"
-#include "game_config_manager.hpp"
+#include "preferences/game.hpp"
 
 namespace events {
 
@@ -31,7 +32,6 @@ void chat_command_handler::print(const std::string& title, const std::string& me
 	chat_handler_.add_chat_message(std::time(nullptr), title, 0, message);
 }
 
-
 void chat_command_handler::do_emote()
 {
 	chat_handler_.send_chat_message("/me " + get_data(), allies_only_);
diff --git a/src/preferences/advanced.cpp b/src/preferences/advanced.cpp
index 047e268df30c..434a296c76a6 100644
--- a/src/preferences/advanced.cpp
+++ b/src/preferences/advanced.cpp
@@ -35,7 +35,7 @@ advanced_manager::advanced_manager(const game_config_view& gc)
 		try {
 			prefs.emplace_back(pref);
 		} catch(const std::invalid_argument& e) {
-			std::cerr << e.what() << std::endl;
+			ERR_ADV << e.what() << std::endl;
 			continue;
 		}
 	}
@@ -77,4 +77,4 @@ const advanced_pref_list& get_advanced_preferences()
 	return singleton->get_preferences();
 }
 
-} // namespace preferences
\ No newline at end of file
+} // namespace preferences
diff --git a/src/preferences/advanced.hpp b/src/preferences/advanced.hpp
index b4d56aa992a9..947b10037048 100644
--- a/src/preferences/advanced.hpp
+++ b/src/preferences/advanced.hpp
@@ -67,4 +67,4 @@ using advanced_pref_list = std::vector<advanced_manager::option>;
 /** Gets a list of the available advanced preferences. */
 const advanced_pref_list& get_advanced_preferences();
 
-} // namespace preferences
\ No newline at end of file
+} // namespace preferences