includes: review

Author: rizsotto

source/intercept/source/Convert.h

@@ -20,7 +20,7 @@
 #pragma once
 
 #include "Domain.h"
-#include "supervise.grpc.pb.h"
+#include "supervise.pb.h"
 
 namespace domain {
 

source/intercept/source/collect/Reporter.h

@@ -35,7 +35,7 @@ namespace ic {
         using Ptr = std::shared_ptr<Reporter>;
         static rust::Result<Reporter::Ptr> from(const flags::Arguments &flags);
 
-        void report(const rpc::Event &request);
+        void report(const rpc::Event &event);
 
     public:
         explicit Reporter(ic::EventsDatabase::Ptr database);

source/intercept/source/report/libexec/Buffer.cc

@@ -17,11 +17,11 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <algorithm>
-
 #include "report/libexec/Array.h"
 #include "report/libexec/Buffer.h"
 
+#include <utility>
+
 namespace el {
 
     char const* Buffer::store(char const* const input) noexcept

source/intercept/source/report/libexec/Environment.cc

@@ -17,8 +17,6 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "config.h"
-
 #include "report/libexec/Environment.h"
 #include "report/libexec/Array.h"
 

source/intercept/source/report/libexec/Executor.h

@@ -19,10 +19,15 @@
 
 #pragma once
 
-#include <spawn.h>
+#include "config.h"
 
 #include "libresult/Result.h"
 
+#ifdef HAVE_SPAWN_H
+#include <spawn.h>
+#endif
+#include <sys/types.h>
+
 namespace el {
 
     struct Linker;

source/intercept/source/report/libexec/Linker.h

@@ -19,10 +19,14 @@
 
 #pragma once
 
-#include <spawn.h>
+#include "config.h"
 
 #include "libresult/Result.h"
 
+#ifdef HAVE_SPAWN_H
+#include <spawn.h>
+#endif
+
 namespace el {
 
     /**

source/intercept/source/report/libexec/Resolver.cc

@@ -17,6 +17,7 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "config.h"
 #include "report/libexec/Resolver.h"
 
 #include "report/libexec/Array.h"
@@ -25,7 +26,10 @@
 
 #include <algorithm>
 #include <cerrno>
+#include <cstdlib>
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
+#endif
 
 namespace {
 

source/intercept/source/report/libexec/lib.cc

@@ -17,6 +17,8 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "config.h"
+
 #include <atomic>
 #include <cerrno>
 #include <climits>
@@ -28,6 +30,9 @@
 #include "report/libexec/Resolver.h"
 #include "report/libexec/Session.h"
 
+#ifdef HAVE_SPAWN_H
+#include <spawn.h>
+#endif
 #if defined HAVE_NSGETENVIRON
 #include <crt_externs.h>
 #else

source/intercept/source/report/wrapper/Application.h

@@ -23,6 +23,7 @@
 #include "libmain/Application.h"
 #include "libmain/ApplicationLogConfig.h"
 #include "libflags/Flags.h"
+#include "libresult/Result.h"
 
 namespace wr {
     using namespace domain;

source/intercept/source/report/wrapper/EventFactory.cc

@@ -25,6 +25,8 @@
 
 #include <chrono>
 #include <random>
+#include <cstdint>
+#include <string>
 
 namespace {