From 9ff4bdb407ed8d855a3f86a17c99906ff738177b Mon Sep 17 00:00:00 2001
From: Arne H Juul <arnej27959@users.noreply.github.com>
Date: Mon, 24 Apr 2017 12:10:42 +0200
Subject: Revert "Balder/enforce override 2"

---
 storage/src/tests/persistence/mergehandlertest.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'storage/src/tests/persistence/mergehandlertest.cpp')

diff --git a/storage/src/tests/persistence/mergehandlertest.cpp b/storage/src/tests/persistence/mergehandlertest.cpp
index 3f0623fbef0..8147992a516 100644
--- a/storage/src/tests/persistence/mergehandlertest.cpp
+++ b/storage/src/tests/persistence/mergehandlertest.cpp
@@ -3,13 +3,15 @@
 #include <vespa/document/base/testdocman.h>
 #include <vespa/storage/persistence/mergehandler.h>
 #include <vespa/vdstestlib/cppunit/macros.h>
+#include <vespa/storageapi/message/bucket.h>
+#include <vespa/log/log.h>
 #include <tests/persistence/persistencetestutils.h>
 #include <tests/persistence/common/persistenceproviderwrapper.h>
 #include <tests/distributor/messagesenderstub.h>
+#include <vespa/storageframework/defaultimplementation/clock/fakeclock.h>
 #include <vespa/vespalib/objects/nbostream.h>
 #include <cmath>
 
-#include <vespa/log/log.h>
 LOG_SETUP(".test.persistence.handler.merge");
 
 namespace storage {
-- 
cgit v1.2.3