Index: ps/trunk/source/ps/CStrIntern.cpp
===================================================================
--- ps/trunk/source/ps/CStrIntern.cpp
+++ ps/trunk/source/ps/CStrIntern.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2015 Wildfire Games.
+/* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -21,6 +21,7 @@
 
 #include "lib/fnv_hash.h"
 #include "ps/CLogger.h"
+#include "ps/ThreadUtil.h"
 
 #include <boost/unordered_map.hpp>
 
Index: ps/trunk/source/tools/atlas/GameInterface/ActorViewer.h
===================================================================
--- ps/trunk/source/tools/atlas/GameInterface/ActorViewer.h
+++ ps/trunk/source/tools/atlas/GameInterface/ActorViewer.h
@@ -18,13 +18,13 @@
 #ifndef INCLUDED_ACTORVIEWER
 #define INCLUDED_ACTORVIEWER
 
-#include "simulation2/system/Entity.h"
+#include "ps/CStr.h"
 #include "simulation2/helpers/Player.h"
+#include "simulation2/system/Entity.h"
 
 struct ActorViewerImpl;
 struct SColor4ub;
 class CSimulation2;
-class CStrW;
 
 class ActorViewer
 {