diff --git a/simgear/emesary/Transmitter.hxx b/simgear/emesary/Transmitter.hxx
index cb67bc64..339a5488 100644
--- a/simgear/emesary/Transmitter.hxx
+++ b/simgear/emesary/Transmitter.hxx
@@ -21,6 +21,7 @@
 *
 *---------------------------------------------------------------------------*/
 
+#include <algorithm>
 #include <string>
 #include <list>
 #include <set>
diff --git a/simgear/emesary/test_emesary.cxx b/simgear/emesary/test_emesary.cxx
index cca55288..852fa55b 100644
--- a/simgear/emesary/test_emesary.cxx
+++ b/simgear/emesary/test_emesary.cxx
@@ -7,14 +7,14 @@
 
 #include <iostream>
 
-#include <simgear/emesary/emesary.hxx>
+#include <simgear/emesary/Emesary.hxx>
 
 using std::cout;
 using std::cerr;
 using std::endl;
 
-std::atomic<int> nthread = 0;
-std::atomic<int> noperations = 0;
+std::atomic<int> nthread {0};
+std::atomic<int> noperations {0};
 const int MaxIterations = 9999;
 
 class TestThreadNotification : public simgear::Emesary::INotification