Split in hash_xxx, array, lru, cache ++ in hpp files. To reduce clinon build

4 files changed, 3 insertions, 10 deletions

diff --git a/messagebus/src/tests/slobrok/slobrok.cpp b/messagebus/src/tests/slobrok/slobrok.cpp
index d51a5330cd5..82d16c9dcf2 100644
--- a/messagebus/src/tests/slobrok/slobrok.cpp
+++ b/messagebus/src/tests/slobrok/slobrok.cpp
@@ -1,7 +1,5 @@
 // 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("slobrok_test");
+
 #include <vespa/vespalib/testkit/testapp.h>
 #include <vespa/messagebus/testlib/slobrok.h>
 #include <string>
diff --git a/messagebus/src/vespa/messagebus/network/rpcservicepool.cpp b/messagebus/src/vespa/messagebus/network/rpcservicepool.cpp
index 13b0da585fa..3b0e0072d38 100644
--- a/messagebus/src/vespa/messagebus/network/rpcservicepool.cpp
+++ b/messagebus/src/vespa/messagebus/network/rpcservicepool.cpp
@@ -1,9 +1,8 @@
 // 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 <algorithm>
 #include "rpcservicepool.h"
 #include "rpcnetwork.h"
+#include <vespa/vespalib/stllike/lrucache_map.hpp>
 
 namespace mbus {
 
diff --git a/messagebus/src/vespa/messagebus/testlib/oosserver.cpp b/messagebus/src/vespa/messagebus/testlib/oosserver.cpp
index d78bacf6b06..ab95541f9c9 100644
--- a/messagebus/src/vespa/messagebus/testlib/oosserver.cpp
+++ b/messagebus/src/vespa/messagebus/testlib/oosserver.cpp
@@ -1,6 +1,5 @@
 // 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 "oosserver.h"
 #include "slobrok.h"
 
diff --git a/messagebus/src/vespa/messagebus/testlib/slobrok.cpp b/messagebus/src/vespa/messagebus/testlib/slobrok.cpp
index 6872e9a66cc..282797d461b 100644
--- a/messagebus/src/vespa/messagebus/testlib/slobrok.cpp
+++ b/messagebus/src/vespa/messagebus/testlib/slobrok.cpp
@@ -1,11 +1,8 @@
 // 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 "slobrok.h"
-#include <vespa/slobrok/cfg.h>
 #include <vespa/slobrok/server/sbenv.h>
-#include <vespa/vespalib/util/sync.h>
-#include <vespa/vespalib/util/vstringfmt.h>
+
 #include <vespa/log/log.h>
 LOG_SETUP(".slobrok");