Fix warnings hidden earlier due to including application headers as system includes

2 files changed, 14 insertions, 19 deletions

diff --git a/logd/src/logd/forward.cpp b/logd/src/logd/forward.cpp
index e4c86583fc0..ea1b89ebbd2 100644
--- a/logd/src/logd/forward.cpp
+++ b/logd/src/logd/forward.cpp
@@ -1,23 +1,23 @@
 // Copyright 2016 Yahoo Inc. 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 <assert.h>
-#include "errhandle.h"
-#include "service.h"
+
 #include "forward.h"
+#include "errhandle.h"
 #include <vespa/vespalib/component/vtag.h>
-#include <vespa/log/log.h>
 
 LOG_SETUP("");
 LOG_RCSID("$Id$");
 
 namespace logdemon {
 
+Forwarder::Forwarder()
+    : _logserverfd(-1),
+      _forwardMap(),
+      _levelparser(),
+      knownServices(),
+      _badLines(0)
+{}
+Forwarder::~Forwarder() {}
+
 void
 Forwarder::forwardText(const char *text, int len)
 {
@@ -34,7 +34,6 @@ Forwarder::forwardText(const char *text, int len)
     }
 }
 
-
 void
 Forwarder::sendMode()
 {
@@ -48,7 +47,6 @@ Forwarder::sendMode()
     }
 }
 
-
 void
 Forwarder::forwardLine(const char *line, const char *eol)
 {
diff --git a/logd/src/logd/forward.h b/logd/src/logd/forward.h
index 1973d0994fe..4b5b1e59bd4 100644
--- a/logd/src/logd/forward.h
+++ b/logd/src/logd/forward.h
@@ -1,6 +1,6 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 #pragma once
-#include <logd/service.h>
+#include "service.h"
 #include <vespa/vespalib/util/hashmap.h>
 #include <map>
 
@@ -36,11 +36,8 @@ private:
 public:
     Services knownServices;
     int _badLines;
-    Forwarder() : _logserverfd(-1),
-                  _forwardMap(),
-                  _levelparser(),
-                  knownServices(),
-                  _badLines(0) {}
+    Forwarder();
+    ~Forwarder();
     void forwardText(const char *text, int len);
     void forwardLine(const char *line, const char *eol);
     void setForwardMap(const ForwardMap & forwardMap) { _forwardMap = forwardMap; }