diff --git a/src/Manager.cc b/src/Manager.cc
index d0ceea09..2ab11e1c 100644
--- a/src/Manager.cc
+++ b/src/Manager.cc
@@ -15,6 +15,8 @@
  *
 */
 
+#include "Manager.hh"
+
 #include <fcntl.h>
 #include <semaphore.h>
 #include <signal.h>
@@ -25,6 +27,7 @@
 
 #include <condition_variable>
 #include <ctime>
+#include <limits>
 #include <list>
 #include <mutex>
 #include <numeric>
@@ -33,6 +36,7 @@
 #include <string>
 #include <thread>
 #include <unordered_set>
+#include <utility>
 #include <vector>
 
 #include <ignition/common/Console.hh>
@@ -44,7 +48,6 @@
 #include "ignition/launch/config.hh"
 #include "ignition/launch/Plugin.hh"
 
-#include "Manager.hh"
 #include "vendor/backward.hpp"
 
 using namespace ignition::launch;
diff --git a/test/integration/plugins/bad_plugins.hh b/test/integration/plugins/bad_plugins.hh
index 52177aac..214e95b1 100644
--- a/test/integration/plugins/bad_plugins.hh
+++ b/test/integration/plugins/bad_plugins.hh
@@ -22,5 +22,5 @@ class SegfaultOnLoad : public ignition::launch::Plugin
 {
   public: SegfaultOnLoad();
   public: virtual bool Load(
-              const tinyxml2::XMLElement * /*_elem*/) override final;
+              const tinyxml2::XMLElement * /*_elem*/) final;
 };