Reduce fastos.h dependency.

20 files changed, 33 insertions, 53 deletions

diff --git a/filedistribution/src/apps/status/status-filedistribution.cpp b/filedistribution/src/apps/status/status-filedistribution.cpp
index 697c7b504af..256266efa54 100644
--- a/filedistribution/src/apps/status/status-filedistribution.cpp
+++ b/filedistribution/src/apps/status/status-filedistribution.cpp
@@ -1,18 +1,17 @@
 // 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("status-filedistribution");
-
-#include <iostream>
-#include <map>
-#include <thread>
-
-#include <boost/program_options.hpp>
 
 #include <vespa/filedistribution/model/zkfacade.h>
 #include <vespa/filedistribution/model/filedistributionmodel.h>
 #include <vespa/filedistribution/model/filedistributionmodelimpl.h>
 #include <zookeeper/zookeeper.h>
+#include <boost/program_options.hpp>
+
+#include <vespa/log/log.h>
+#include <iostream>
+#include <map>
+#include <thread>
+
+LOG_SETUP("status-filedistribution");
 
 using namespace filedistribution;
 using namespace std::literals;
diff --git a/filedistribution/src/vespa/filedistribution/common/componentsdeleter.cpp b/filedistribution/src/vespa/filedistribution/common/componentsdeleter.cpp
index 3c6a265941a..3cb5f4d008f 100644
--- a/filedistribution/src/vespa/filedistribution/common/componentsdeleter.cpp
+++ b/filedistribution/src/vespa/filedistribution/common/componentsdeleter.cpp
@@ -1,5 +1,4 @@
 // 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 "componentsdeleter.h"
 
 #include <vespa/log/log.h>
diff --git a/filedistribution/src/vespa/filedistribution/common/exception.cpp b/filedistribution/src/vespa/filedistribution/common/exception.cpp
index c9bb5f43ab0..93d07d69118 100644
--- a/filedistribution/src/vespa/filedistribution/common/exception.cpp
+++ b/filedistribution/src/vespa/filedistribution/common/exception.cpp
@@ -1,5 +1,4 @@
 // 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 "exception.h"
 
 namespace filedistribution {
diff --git a/filedistribution/src/vespa/filedistribution/distributor/filedownloader.cpp b/filedistribution/src/vespa/filedistribution/distributor/filedownloader.cpp
index e042ec28870..cbd93eb2e57 100644
--- a/filedistribution/src/vespa/filedistribution/distributor/filedownloader.cpp
+++ b/filedistribution/src/vespa/filedistribution/distributor/filedownloader.cpp
@@ -1,11 +1,7 @@
 // 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/filedistribution/model/zkfacade.h>
 #include "filedownloader.h"
 #include "hostname.h"
-
-#include <iterator>
-#include <algorithm>
+#include <vespa/filedistribution/model/zkfacade.h>
 
 #include <boost/filesystem.hpp>
 #include <boost/filesystem/fstream.hpp>
@@ -17,6 +13,9 @@
 #include <libtorrent/torrent_handle.hpp>
 #include <libtorrent/bencode.hpp>
 
+#include <iterator>
+#include <algorithm>
+
 #include <vespa/log/log.h>
 LOG_SETUP(".filedownloader");
 
diff --git a/filedistribution/src/vespa/filedistribution/distributor/filedownloadermanager.cpp b/filedistribution/src/vespa/filedistribution/distributor/filedownloadermanager.cpp
index 5b6ad4f83ff..2b143b9c083 100644
--- a/filedistribution/src/vespa/filedistribution/distributor/filedownloadermanager.cpp
+++ b/filedistribution/src/vespa/filedistribution/distributor/filedownloadermanager.cpp
@@ -1,14 +1,13 @@
 // 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(".filedownloadermanager");
-
 #include "filedownloadermanager.h"
 
 #include <iterator>
 #include <sstream>
 #include <thread>
 
+#include <vespa/log/log.h>
+LOG_SETUP(".filedownloadermanager");
+
 using namespace std::literals;
 
 using filedistribution::FileDownloaderManager;
diff --git a/filedistribution/src/vespa/filedistribution/distributor/scheduler.cpp b/filedistribution/src/vespa/filedistribution/distributor/scheduler.cpp
index 4f75afb4850..ac05a24ad36 100644
--- a/filedistribution/src/vespa/filedistribution/distributor/scheduler.cpp
+++ b/filedistribution/src/vespa/filedistribution/distributor/scheduler.cpp
@@ -1,7 +1,6 @@
 // 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 "scheduler.h"
-#include <iostream>
 
 namespace asio = boost::asio;
 
diff --git a/filedistribution/src/vespa/filedistribution/distributor/state_server_impl.cpp b/filedistribution/src/vespa/filedistribution/distributor/state_server_impl.cpp
index 95a0a1a64ca..6ec9c677687 100644
--- a/filedistribution/src/vespa/filedistribution/distributor/state_server_impl.cpp
+++ b/filedistribution/src/vespa/filedistribution/distributor/state_server_impl.cpp
@@ -1,6 +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 "state_server_impl.h"
 
 namespace filedistribution {
diff --git a/filedistribution/src/vespa/filedistribution/manager/createtorrent.cpp b/filedistribution/src/vespa/filedistribution/manager/createtorrent.cpp
index 52b05cd78be..551e6e0c1cb 100644
--- a/filedistribution/src/vespa/filedistribution/manager/createtorrent.cpp
+++ b/filedistribution/src/vespa/filedistribution/manager/createtorrent.cpp
@@ -1,7 +1,9 @@
 // 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 "createtorrent.h"
 
+#include <libtorrent/torrent_info.hpp>
+#include <boost/filesystem/convenience.hpp>
+
 #include <iostream>
 #include <fstream>
 #include <cmath>
@@ -9,9 +11,6 @@
 #include <sstream>
 #include <string>
 
-#include <boost/filesystem/convenience.hpp>
-#include "libtorrent/torrent_info.hpp"
-
 namespace fs = boost::filesystem;
 
 namespace {
diff --git a/filedistribution/src/vespa/filedistribution/manager/filedb.cpp b/filedistribution/src/vespa/filedistribution/manager/filedb.cpp
index a5c440b93a0..fc8c8a95442 100644
--- a/filedistribution/src/vespa/filedistribution/manager/filedb.cpp
+++ b/filedistribution/src/vespa/filedistribution/manager/filedb.cpp
@@ -1,5 +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 "filedb.h"
 
 #include <boost/filesystem.hpp>
diff --git a/filedistribution/src/vespa/filedistribution/manager/filedistributionmanager.cpp b/filedistribution/src/vespa/filedistribution/manager/filedistributionmanager.cpp
index 6af340a0ff6..0da6588958f 100644
--- a/filedistribution/src/vespa/filedistribution/manager/filedistributionmanager.cpp
+++ b/filedistribution/src/vespa/filedistribution/manager/filedistributionmanager.cpp
@@ -1,16 +1,16 @@
 // 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 "jnistring.h"
+#include "field.h"
+#include "createtorrent.h"
+#include "filedb.h"
 #include <vespa/filedistribution/manager/com_yahoo_vespa_filedistribution_FileDistributionManager.h>
 
-#include <memory>
 #include <vespa/filedistribution/model/filedistributionmodel.h>
 #include <vespa/filedistribution/model/zkfiledbmodel.h>
 #include <vespa/filedistribution/model/mockfiledistributionmodel.h>
 #include <vespa/filedistribution/model/zkfacade.h>
-#include "jnistring.h"
-#include "field.h"
-#include "createtorrent.h"
-#include "filedb.h"
+#include <memory>
 
 using namespace filedistribution;
 
diff --git a/filedistribution/src/vespa/filedistribution/manager/jnistring.h b/filedistribution/src/vespa/filedistribution/manager/jnistring.h
index aa5d459232e..295cfc0fe8b 100644
--- a/filedistribution/src/vespa/filedistribution/manager/jnistring.h
+++ b/filedistribution/src/vespa/filedistribution/manager/jnistring.h
@@ -3,7 +3,7 @@
 
 #include <exception>
 #include <string>
-
+#include <vector>
 #include <jni.h>
 
 namespace filedistribution {
diff --git a/filedistribution/src/vespa/filedistribution/manager/stderr_logfwd.cpp b/filedistribution/src/vespa/filedistribution/manager/stderr_logfwd.cpp
index a5041554114..0907509bbab 100644
--- a/filedistribution/src/vespa/filedistribution/manager/stderr_logfwd.cpp
+++ b/filedistribution/src/vespa/filedistribution/manager/stderr_logfwd.cpp
@@ -1,11 +1,9 @@
 // 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/filedistribution/common/logfwd.h>
 
-#include <stdarg.h>
 #include <iostream>
-#include <stdio.h>
-
+#include <vector>
 
 
 void filedistribution::logfwd::log_forward(LogLevel level, const char* file, int line, const char* fmt, ...)
diff --git a/filedistribution/src/vespa/filedistribution/model/deployedfilestodownload.cpp b/filedistribution/src/vespa/filedistribution/model/deployedfilestodownload.cpp
index 7829744949f..05ee8db9060 100644
--- a/filedistribution/src/vespa/filedistribution/model/deployedfilestodownload.cpp
+++ b/filedistribution/src/vespa/filedistribution/model/deployedfilestodownload.cpp
@@ -1,12 +1,10 @@
 // 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 "deployedfilestodownload.h"
 
+#include "deployedfilestodownload.h"
+#include <vespa/filedistribution/common/logfwd.h>
 #include <sstream>
 #include <iterator>
 
-#include <vespa/filedistribution/common/logfwd.h>
-
 using filedistribution::DeployedFilesToDownload;
 using filedistribution::Path;
 
diff --git a/frtstream/src/example/test.cpp b/frtstream/src/example/test.cpp
index 5af115f9978..0c230f2d5bf 100644
--- a/frtstream/src/example/test.cpp
+++ b/frtstream/src/example/test.cpp
@@ -1,14 +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/frtstream/frtclientstream.h>
+
 #include <iostream>
 #include <csignal>
 #include <vector>
 #include <string>
 #include <set>
 
-#include <vespa/frtstream/frtclientstream.h>
-
-
 using namespace std;
 using frtstream::FrtClientStream;
 using frtstream::Method;
diff --git a/juniper/src/test/appender_test.cpp b/juniper/src/test/appender_test.cpp
index 7887247d9f2..32a58a16bb0 100644
--- a/juniper/src/test/appender_test.cpp
+++ b/juniper/src/test/appender_test.cpp
@@ -1,5 +1,4 @@
 // 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>
 
 #define _NEED_SUMMARY_CONFIG_IMPL
diff --git a/juniper/src/test/fakerewriter.cpp b/juniper/src/test/fakerewriter.cpp
index c02fc29b119..962f3d0e2f9 100644
--- a/juniper/src/test/fakerewriter.cpp
+++ b/juniper/src/test/fakerewriter.cpp
@@ -1,5 +1,4 @@
 // 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 "fakerewriter.h"
 #include <vespa/vespalib/util/stringfmt.h>
 
diff --git a/juniper/src/test/matchobjectTest.cpp b/juniper/src/test/matchobjectTest.cpp
index 81b3f0e1a79..32f249ae720 100644
--- a/juniper/src/test/matchobjectTest.cpp
+++ b/juniper/src/test/matchobjectTest.cpp
@@ -16,7 +16,6 @@
  *                              ALL RIGHTS RESERVED
  * </pre>
  ***************************************************************************/
-#include <vespa/fastos/fastos.h>
 #include "matchobjectTest.h"
 #include "fakerewriter.h"
 
diff --git a/juniper/src/test/queryparserTest.cpp b/juniper/src/test/queryparserTest.cpp
index c78af7a98c2..6f1065f279c 100644
--- a/juniper/src/test/queryparserTest.cpp
+++ b/juniper/src/test/queryparserTest.cpp
@@ -16,7 +16,6 @@
  *                              ALL RIGHTS RESERVED
  * </pre>
  ***************************************************************************/
-#include <vespa/fastos/fastos.h>
 #include "queryparserTest.h"
 #include "fakerewriter.h"
 
diff --git a/juniper/src/test/queryvisitor_test.cpp b/juniper/src/test/queryvisitor_test.cpp
index 18dda67f43f..612336ae78b 100644
--- a/juniper/src/test/queryvisitor_test.cpp
+++ b/juniper/src/test/queryvisitor_test.cpp
@@ -1,6 +1,5 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 #include <memory>
-#include <vespa/fastos/fastos.h>
 #include <vespa/vespalib/testkit/testapp.h>
 
 #include <vespa/juniper/queryhandle.h>
diff --git a/juniper/src/test/testenv.cpp b/juniper/src/test/testenv.cpp
index 17187e33a28..ff4331148d3 100644
--- a/juniper/src/test/testenv.cpp
+++ b/juniper/src/test/testenv.cpp
@@ -3,7 +3,6 @@
  * within test framework
  */
 
-#include <vespa/fastos/fastos.h>
 #include "testenv.h"
 #include <vespa/juniper/propreader.h>