GC unused boost includes.

7 files changed, 2 insertions, 14 deletions

diff --git a/filedistribution/src/apps/filedistributor/filedistributor.cpp b/filedistribution/src/apps/filedistributor/filedistributor.cpp
index 02ac28e9a1b..a690b7dc14b 100644
--- a/filedistribution/src/apps/filedistributor/filedistributor.cpp
+++ b/filedistribution/src/apps/filedistributor/filedistributor.cpp
@@ -6,7 +6,6 @@
 
 #include <boost/program_options.hpp>
 #include <boost/exception/diagnostic_information.hpp>
-#include <boost/scope_exit.hpp>
 
 #include <vespa/fastos/app.h>
 #include <vespa/config-zookeepers.h>
diff --git a/filedistribution/src/vespa/filedistribution/distributor/filedistributortrackerimpl.h b/filedistribution/src/vespa/filedistribution/distributor/filedistributortrackerimpl.h
index bf72a2b80df..abb7367974a 100644
--- a/filedistribution/src/vespa/filedistribution/distributor/filedistributortrackerimpl.h
+++ b/filedistribution/src/vespa/filedistribution/distributor/filedistributortrackerimpl.h
@@ -4,9 +4,6 @@
 #include <libtorrent/session.hpp>
 #include <libtorrent/torrent.hpp>
 
-#include <boost/asio/io_service.hpp>
-#include <boost/asio/deadline_timer.hpp>
-
 #include <vespa/filedistribution/model/filedistributionmodel.h>
 #include "scheduler.h"
 #include <mutex>
@@ -26,7 +23,7 @@ class FileDistributorTrackerImpl : public FileDistributionTracker  {
 
     //Use separate worker thread to avoid potential deadlock
     //between tracker requests and files to download changed requests.
-    boost::scoped_ptr<Scheduler> _scheduler;
+    std::unique_ptr<Scheduler> _scheduler;
 public:
     FileDistributorTrackerImpl(const std::shared_ptr<FileDistributionModel>& model);
 
diff --git a/filedistribution/src/vespa/filedistribution/distributor/filedownloader.h b/filedistribution/src/vespa/filedistribution/distributor/filedownloader.h
index c089f31976a..e233dc46ecb 100644
--- a/filedistribution/src/vespa/filedistribution/distributor/filedownloader.h
+++ b/filedistribution/src/vespa/filedistribution/distributor/filedownloader.h
@@ -3,12 +3,7 @@
 
 #include <vector>
 #include <mutex>
-#include <boost/filesystem/path.hpp>
 #include <boost/optional.hpp>
-#include <boost/multi_index_container.hpp>
-#include <boost/multi_index/indexed_by.hpp>
-#include <boost/multi_index/member.hpp>
-#include <boost/multi_index/ordered_index.hpp>
 
 #include <libtorrent/session.hpp>
 
diff --git a/filedistribution/src/vespa/filedistribution/manager/createtorrent.h b/filedistribution/src/vespa/filedistribution/manager/createtorrent.h
index cffeb435643..164f93a5625 100644
--- a/filedistribution/src/vespa/filedistribution/manager/createtorrent.h
+++ b/filedistribution/src/vespa/filedistribution/manager/createtorrent.h
@@ -2,7 +2,6 @@
 #pragma once
 
 #include <vector>
-#include <boost/filesystem/path.hpp>
 #include <libtorrent/create_torrent.hpp>
 
 #include <vespa/filedistribution/common/buffer.h>
diff --git a/filedistribution/src/vespa/filedistribution/manager/filedb.h b/filedistribution/src/vespa/filedistribution/manager/filedb.h
index 195f1a65ffc..9b62e583f6d 100644
--- a/filedistribution/src/vespa/filedistribution/manager/filedb.h
+++ b/filedistribution/src/vespa/filedistribution/manager/filedb.h
@@ -2,7 +2,6 @@
 #pragma once
 
 #include <string>
-#include <boost/filesystem/path.hpp>
 #include <vespa/filedistribution/model/filedbmodel.h>
 
 namespace filedistribution {
diff --git a/filedistribution/src/vespa/filedistribution/model/deployedfilestodownload.h b/filedistribution/src/vespa/filedistribution/model/deployedfilestodownload.h
index 099eb11cbe9..36c89e89501 100644
--- a/filedistribution/src/vespa/filedistribution/model/deployedfilestodownload.h
+++ b/filedistribution/src/vespa/filedistribution/model/deployedfilestodownload.h
@@ -1,7 +1,6 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 #pragma once
 
-#include <boost/filesystem/path.hpp>
 #include "zkfacade.h"
 #include "zkfiledbmodel.h"
 
diff --git a/filedistribution/src/vespa/filedistribution/model/zkfacade.h b/filedistribution/src/vespa/filedistribution/model/zkfacade.h
index 9197b33f64b..bebc133590d 100644
--- a/filedistribution/src/vespa/filedistribution/model/zkfacade.h
+++ b/filedistribution/src/vespa/filedistribution/model/zkfacade.h
@@ -3,8 +3,8 @@
 
 #include <string>
 #include <vector>
+#include <map>
 #include <mutex>
-#include <boost/signals2.hpp>
 
 #include <vespa/filedistribution/common/buffer.h>
 #include <vespa/filedistribution/common/exception.h>