5 files changed, 15 insertions, 18 deletions
diff --git a/config/src/apps/configproxy-cmd/main.cpp b/config/src/apps/configproxy-cmd/main.cpp
index 34f2eeab143..b9090d3b641 100644
--- a/config/src/apps/configproxy-cmd/main.cpp
+++ b/config/src/apps/configproxy-cmd/main.cpp
@@ -1,11 +1,10 @@
 // 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 <iostream>
-#include <vespa/vespalib/stllike/string.h>
 #include "flags.h"
 #include "proxycmd.h"
 #include "methods.h"
+#include <vespa/fastos/app.h>
+#include <iostream>
 
 class Application : public FastOS_Application
 {
diff --git a/config/src/apps/configproxy-cmd/methods.cpp b/config/src/apps/configproxy-cmd/methods.cpp
index 8345316c6a4..086ec107553 100644
--- a/config/src/apps/configproxy-cmd/methods.cpp
+++ b/config/src/apps/configproxy-cmd/methods.cpp
@@ -1,5 +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 "methods.h"
 #include <iostream>
 
diff --git a/config/src/apps/configproxy-cmd/proxycmd.cpp b/config/src/apps/configproxy-cmd/proxycmd.cpp
index 34bd354c79f..48c343367f7 100644
--- a/config/src/apps/configproxy-cmd/proxycmd.cpp
+++ b/config/src/apps/configproxy-cmd/proxycmd.cpp
@@ -1,8 +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 "proxycmd.h"
 #include <iostream>
-#include <vespa/vespalib/util/vstringfmt.h>
+#include <vespa/vespalib/util/stringfmt.h>
 
 ProxyCmd::ProxyCmd(const Flags& flags)
     : _supervisor(NULL),
@@ -46,7 +46,7 @@ void ProxyCmd::printArray(FRT_Values *rvals) {
 }
 
 vespalib::string ProxyCmd::makeSpec() {
-    return vespalib::make_vespa_string("tcp/%s:%d", _flags.hostname.c_str(), _flags.portnumber);
+    return vespalib::make_string("tcp/%s:%d", _flags.hostname.c_str(), _flags.portnumber);
 }
 
 void ProxyCmd::autoPrint() {
diff --git a/config/src/apps/getvespaconfig/getconfig.cpp b/config/src/apps/getvespaconfig/getconfig.cpp
index 95e804381d0..820e0f7178e 100644
--- a/config/src/apps/getvespaconfig/getconfig.cpp
+++ b/config/src/apps/getvespaconfig/getconfig.cpp
@@ -1,21 +1,20 @@
 // 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("getconfig");
 
 #include <vespa/fnet/frt/frt.h>
 #include <vespa/config/config.h>
-#include <vespa/config/frt/protocol.h>
 #include <vespa/config/frt/frtconfigrequestfactory.h>
 #include <vespa/config/frt/frtconnection.h>
 #include <vespa/config/common/payload_converter.h>
-#include <vespa/config/common/vespa_version.h>
+#include <vespa/fastos/app.h>
+
 
 #include <string>
 #include <sstream>
 #include <fstream>
 
+#include <vespa/log/log.h>
+LOG_SETUP("getconfig");
+
 using namespace config;
 
 class GetConfig : public FastOS_Application
diff --git a/config/src/apps/pingproxy/pingproxy.cpp b/config/src/apps/pingproxy/pingproxy.cpp
index 444d024e240..db790820e64 100644
--- a/config/src/apps/pingproxy/pingproxy.cpp
+++ b/config/src/apps/pingproxy/pingproxy.cpp
@@ -1,14 +1,13 @@
 // 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("pingproxy");
 
 #include <vespa/fnet/frt/frt.h>
+#include <vespa/fastos/app.h>
 
-#include <string>
 #include <sstream>
 
+#include <vespa/log/log.h>
+LOG_SETUP("pingproxy");
+
 
 class PingProxy : public FastOS_Application
 {