1 files changed, 6 insertions, 7 deletions
diff --git a/searchcore/src/tests/proton/documentdb/feedhandler/feedhandler_test.cpp b/searchcore/src/tests/proton/documentdb/feedhandler/feedhandler_test.cpp
index 8a7f646383f..168bb7cefad 100644
--- a/searchcore/src/tests/proton/documentdb/feedhandler/feedhandler_test.cpp
+++ b/searchcore/src/tests/proton/documentdb/feedhandler/feedhandler_test.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("feedhandler_test");
+
 #include <vespa/documentapi/messagebus/documentprotocol.h>
 #include <vespa/documentapi/messagebus/messages/documentreply.h>
 #include <vespa/documentapi/messagebus/messages/removedocumentreply.h>
@@ -23,6 +21,9 @@ LOG_SETUP("feedhandler_test");
 #include <vespa/vespalib/testkit/testapp.h>
 #include <vespa/vespalib/util/closuretask.h>
 #include <vespa/searchcore/proton/bucketdb/bucketdbhandler.h>
+#include <vespa/vespalib/util/exceptions.h>
+#include <vespa/log/log.h>
+LOG_SETUP("feedhandler_test");
 
 using document::BucketId;
 using document::Document;
@@ -35,9 +36,7 @@ using documentapi::DocumentReply;
 using documentapi::RemoveDocumentReply;
 using documentapi::UpdateDocumentReply;
 using mbus::Reply;
-using search::index::DocBuilder;
-using search::index::DummyFileHeaderContext;
-using search::index::Schema;
+using namespace search::index;
 using search::SerialNum;
 using search::transactionlog::TransLogServer;
 using storage::spi::PartitionId;
@@ -259,7 +258,7 @@ struct SchemaContext {
         schema(new Schema()),
         builder()
     {
-        schema->addIndexField(Schema::IndexField("i1", Schema::STRING, Schema::SINGLE));
+        schema->addIndexField(Schema::IndexField("i1", schema::STRING, schema::SINGLE));
         builder.reset(new DocBuilder(*schema));
     }
     DocTypeName getDocType() const {