Targeted include and cast to avoid template generation.

2 files changed, 2 insertions, 2 deletions

diff --git a/storage/src/tests/frameworkimpl/memory/memorystatusviewertest.cpp b/storage/src/tests/frameworkimpl/memory/memorystatusviewertest.cpp
index 383098cefe1..dc0fcc5592a 100644
--- a/storage/src/tests/frameworkimpl/memory/memorystatusviewertest.cpp
+++ b/storage/src/tests/frameworkimpl/memory/memorystatusviewertest.cpp
@@ -1,12 +1,12 @@
 // 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/metrics/metrics.h>
 #include <vespa/metrics/metricmanager.h>
 #include <vespa/storage/frameworkimpl/memory/memorystatusviewer.h>
 #include <vespa/storageframework/defaultimplementation/memory/prioritymemorylogic.h>
 #include <tests/common/teststorageapp.h>
 #include <vespa/vdstestlib/cppunit/macros.h>
+#include <boost/lexical_cast.hpp>
 
 namespace storage {
 
diff --git a/storage/src/tests/frameworkimpl/status/statustest.cpp b/storage/src/tests/frameworkimpl/status/statustest.cpp
index 0fc10e411cb..84fbd875cf2 100644
--- a/storage/src/tests/frameworkimpl/status/statustest.cpp
+++ b/storage/src/tests/frameworkimpl/status/statustest.cpp
@@ -71,7 +71,7 @@ namespace {
                 const framework::HttpUrlPath&) const
         {
             xos << vespalib::xml::XmlTag("mytag")
-                << vespalib::xml::XmlAttribute("foo", "bar")
+                << vespalib::xml::XmlAttribute("foo", (const char *)"bar")
                 << vespalib::xml::XmlContent("content")
                 << vespalib::xml::XmlEndTag();
             return "";