2 files changed, 3 insertions, 9 deletions
diff --git a/slobrok/src/vespa/slobrok/server/managed_rpc_server.cpp b/slobrok/src/vespa/slobrok/server/managed_rpc_server.cpp
index 88414e7ab19..0513f30c1dc 100644
--- a/slobrok/src/vespa/slobrok/server/managed_rpc_server.cpp
+++ b/slobrok/src/vespa/slobrok/server/managed_rpc_server.cpp
@@ -1,11 +1,9 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-#include <vespa/fastos/fastos.h>
-
-#include <vespa/log/log.h>
-LOG_SETUP(".rpcserver");
 
 #include "managed_rpc_server.h"
 #include "i_rpc_server_manager.h"
+#include <vespa/log/log.h>
+LOG_SETUP(".rpcserver");
 
 namespace slobrok {
 
diff --git a/slobrok/src/vespa/slobrok/server/monitor.cpp b/slobrok/src/vespa/slobrok/server/monitor.cpp
index 6ff7d7dd422..70df443af86 100644
--- a/slobrok/src/vespa/slobrok/server/monitor.cpp
+++ b/slobrok/src/vespa/slobrok/server/monitor.cpp
@@ -1,8 +1,4 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-#include <vespa/fastos/fastos.h>
-
-#include <vespa/log/log.h>
-LOG_SETUP(".monitor");
 
 #include "monitor.h"
 
@@ -29,7 +25,7 @@ Monitor::~Monitor()
 void
 Monitor::enable(FRT_Target *monitorTarget)
 {
-    LOG_ASSERT(monitorTarget != NULL);
+    assert(monitorTarget != NULL);
     Unschedule();
     disconnect();
     _enabled = true;