Remove more clutter in fastos/types.h

3 files changed, 9 insertions, 14 deletions

diff --git a/logd/src/apps/logd/main.cpp b/logd/src/apps/logd/main.cpp
index 48450f323e9..caeaf83c7cc 100644
--- a/logd/src/apps/logd/main.cpp
+++ b/logd/src/apps/logd/main.cpp
@@ -1,16 +1,4 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
-#include <fcntl.h>
-#include <errno.h>
-#include <unistd.h>
-#include <time.h>
-#include <sys/stat.h>
-
-#include <vespa/log/log.h>
-LOG_SETUP("logdemon");
-LOG_RCSID("$Id$");
 
 #include <logd/errhandle.h>
 #include <logd/sigterm.h>
@@ -18,8 +6,14 @@ LOG_RCSID("$Id$");
 #include <logd/forward.h>
 #include <logd/conf.h>
 #include <logd/watch.h>
-#include <logd/conn.h>
 #include <vespa/config/common/exceptions.h>
+#include <csignal>
+#include <unistd.h>
+
+#include <vespa/log/log.h>
+LOG_SETUP("logdemon");
+
+
 
 using namespace logdemon;
 using config::FileSpec;
diff --git a/logd/src/logd/service.cpp b/logd/src/logd/service.cpp
index 8e2237b1973..cd4304f5405 100644
--- a/logd/src/logd/service.cpp
+++ b/logd/src/logd/service.cpp
@@ -7,7 +7,7 @@
 #include <unistd.h>
 #include <time.h>
 #include <sys/stat.h>
-#include <assert.h>
+#include <cassert>
 
 #include <vespa/log/log.h>
 #include <vespa/log/control-file.h>
diff --git a/logd/src/logd/watch.cpp b/logd/src/logd/watch.cpp
index 4a5e7df1474..0558d0b4548 100644
--- a/logd/src/logd/watch.cpp
+++ b/logd/src/logd/watch.cpp
@@ -12,6 +12,7 @@
 #include <unistd.h>
 #include <fcntl.h>
 #include <sys/stat.h>
+#include <sys/time.h>
 
 LOG_SETUP("");