2 files changed, 12 insertions, 6 deletions
diff --git a/configutil/src/tests/config_status/config_status_test.cpp b/configutil/src/tests/config_status/config_status_test.cpp
index 39442068330..77fcf1b8da8 100644
--- a/configutil/src/tests/config_status/config_status_test.cpp
+++ b/configutil/src/tests/config_status/config_status_test.cpp
@@ -1,10 +1,14 @@
 // 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/vespalib/testkit/testapp.h>
 #include <lib/configstatus.h>
+#include <iostream>
 #include <vespa/fastlib/net/httpserver.h>
 #include <vespa/config-model.h>
 #include <vespa/config/config.h>
 #include <vespa/config/subscription/sourcespec.h>
+#include <vector>
+#include <string>
 
 using namespace config;
 
@@ -13,7 +17,8 @@ private:
     std::string _reply;
     bool _fail;
 
-    void onGetRequest(const string &, const string &, Fast_HTTPConnection &conn) override {
+    virtual void onGetRequest(const string &, const string &,
+                              Fast_HTTPConnection &conn) override {
         if (_fail) {
             conn.Output(conn.GetHTTPVersion().c_str());
             conn.Output(" 500 Error\r\n");
diff --git a/configutil/src/tests/model_inspect/model_inspect_test.cpp b/configutil/src/tests/model_inspect/model_inspect_test.cpp
index fe818e8e4e4..be45d4d0d46 100644
--- a/configutil/src/tests/model_inspect/model_inspect_test.cpp
+++ b/configutil/src/tests/model_inspect/model_inspect_test.cpp
@@ -1,7 +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 <vespa/vespalib/testkit/test_kit.h>
 #include <lib/modelinspect.h>
-#include <sstream>
+#include <iostream>
 
 class Model {
 public:
@@ -88,11 +89,11 @@ public:
     void listServices() override { _listServices = true; };
     void listClusters() override { _listClusters = true; };
     void listConfigIds() override { _listConfigIds = true; };
-    int listHost(const vespalib::string) override  { _listHost = true; return 0; };
+    int listHost(const vespalib::string)  override { _listHost = true; return 0; };
     int listAllPorts() override { _listAllPorts = true; return 0; };
-    int listCluster(const vespalib::string) override  { _listCluster = true; return 0; };
-    int listService(const vespalib::string) override  { _listService = true; return 0; };
-    int listService(const vespalib::string, const vespalib::string) override  { _listService2 = true; return 0; };
+    int listCluster(const vespalib::string)  override { _listCluster = true; return 0; };
+    int listService(const vespalib::string)  override { _listService = true; return 0; };
+    int listService(const vespalib::string, const vespalib::string)  override { _listService2 = true; return 0; };
     int listConfigId(const vespalib::string) override { _listConfigId = true; return 0; };
     int getIndexOf(const vespalib::string, const vespalib::string) override { _getIndexOf = true; return 0; };