Do not include fastos.h in header files.

17 files changed, 2 insertions, 15 deletions

diff --git a/searchcore/src/vespa/searchcore/fdispatch/common/appcontext.h b/searchcore/src/vespa/searchcore/fdispatch/common/appcontext.h
index 1b27d647616..f79ba298fec 100644
--- a/searchcore/src/vespa/searchcore/fdispatch/common/appcontext.h
+++ b/searchcore/src/vespa/searchcore/fdispatch/common/appcontext.h
@@ -4,7 +4,6 @@
 
 #pragma once
 
-#include <vespa/fastos/fastos.h>
 #include <vespa/vespalib/util/clock.h>
 
 class FastS_NodeManager;
diff --git a/searchcore/src/vespa/searchcore/fdispatch/common/rpc.h b/searchcore/src/vespa/searchcore/fdispatch/common/rpc.h
index 9ac19c3fea7..9693d31314e 100644
--- a/searchcore/src/vespa/searchcore/fdispatch/common/rpc.h
+++ b/searchcore/src/vespa/searchcore/fdispatch/common/rpc.h
@@ -4,7 +4,6 @@
 
 #pragma once
 
-#include <vespa/fastos/fastos.h>
 #include <vespa/fnet/frt/frt.h>
 #include <vespa/searchcore/fdispatch/common/appcontext.h>
 #include <vespa/vespalib/stllike/string.h>
diff --git a/searchcore/src/vespa/searchcore/fdispatch/program/rpc.h b/searchcore/src/vespa/searchcore/fdispatch/program/rpc.h
index eb4f87610b9..341e9765d10 100644
--- a/searchcore/src/vespa/searchcore/fdispatch/program/rpc.h
+++ b/searchcore/src/vespa/searchcore/fdispatch/program/rpc.h
@@ -4,7 +4,6 @@
 
 #pragma once
 
-#include <vespa/fastos/fastos.h>
 #include <vespa/fnet/frt/frt.h>
 #include <vespa/searchcore/fdispatch/common/rpc.h>
 
diff --git a/searchcore/src/vespa/searchcore/fdispatch/search/child_info.h b/searchcore/src/vespa/searchcore/fdispatch/search/child_info.h
index ce54bc6b38d..00495d86c6e 100644
--- a/searchcore/src/vespa/searchcore/fdispatch/search/child_info.h
+++ b/searchcore/src/vespa/searchcore/fdispatch/search/child_info.h
@@ -2,7 +2,6 @@
 
 #pragma once
 
-#include <vespa/fastos/fastos.h>
 
 #include "poss_count.h"
 
diff --git a/searchcore/src/vespa/searchcore/fdispatch/search/configdesc.h b/searchcore/src/vespa/searchcore/fdispatch/search/configdesc.h
index 863047e4695..ea873d3ab30 100644
--- a/searchcore/src/vespa/searchcore/fdispatch/search/configdesc.h
+++ b/searchcore/src/vespa/searchcore/fdispatch/search/configdesc.h
@@ -4,7 +4,6 @@
 
 #pragma once
 
-#include <vespa/fastos/fastos.h>
 #include <vespa/searchlib/common/fslimits.h>
 #include <vespa/searchcore/fdispatch/common/stdincl.h>
 #include <vespa/searchcore/config/config-partitions.h>
diff --git a/searchcore/src/vespa/searchcore/fdispatch/search/dataset_base.h b/searchcore/src/vespa/searchcore/fdispatch/search/dataset_base.h
index 6590c76e03b..425712cf1c7 100644
--- a/searchcore/src/vespa/searchcore/fdispatch/search/dataset_base.h
+++ b/searchcore/src/vespa/searchcore/fdispatch/search/dataset_base.h
@@ -4,7 +4,6 @@
 
 #pragma once
 
-#include <vespa/fastos/fastos.h>
 #include "child_info.h"
 #include <vespa/searchcore/fdispatch/common/timestat.h>
 #include <vespa/searchcore/util/log.h>
diff --git a/searchcore/src/vespa/searchcore/fdispatch/search/datasetcollection.h b/searchcore/src/vespa/searchcore/fdispatch/search/datasetcollection.h
index af47e6d953c..1c1db158d27 100644
--- a/searchcore/src/vespa/searchcore/fdispatch/search/datasetcollection.h
+++ b/searchcore/src/vespa/searchcore/fdispatch/search/datasetcollection.h
@@ -4,7 +4,6 @@
 
 #pragma once
 
-#include <vespa/fastos/fastos.h>
 #include <vespa/vespalib/util/referencecounter.h>
 #include <vespa/searchcore/fdispatch/common/appcontext.h>
 #include <vespa/searchcore/fdispatch/search/configdesc.h>
diff --git a/searchcore/src/vespa/searchcore/fdispatch/search/engine_base.h b/searchcore/src/vespa/searchcore/fdispatch/search/engine_base.h
index 002064aee77..d65367115d0 100644
--- a/searchcore/src/vespa/searchcore/fdispatch/search/engine_base.h
+++ b/searchcore/src/vespa/searchcore/fdispatch/search/engine_base.h
@@ -4,7 +4,6 @@
 
 #pragma once
 
-#include <vespa/fastos/fastos.h>
 #include <vespa/searchcore/fdispatch/common/timestat.h>
 #include "plain_dataset.h"
 #include "poss_count.h"
diff --git a/searchcore/src/vespa/searchcore/fdispatch/search/fnet_search.h b/searchcore/src/vespa/searchcore/fdispatch/search/fnet_search.h
index e87ce2a5670..8b1abdb0014 100644
--- a/searchcore/src/vespa/searchcore/fdispatch/search/fnet_search.h
+++ b/searchcore/src/vespa/searchcore/fdispatch/search/fnet_search.h
@@ -4,7 +4,6 @@
 
 #pragma once
 
-#include <vespa/fastos/fastos.h>
 #include <vespa/fnet/fnet.h>
 #include <vespa/vespalib/objects/nbostream.h>
 #include <vespa/searchcore/fdispatch/common/search.h>
diff --git a/searchcore/src/vespa/searchcore/fdispatch/search/mergehits.h b/searchcore/src/vespa/searchcore/fdispatch/search/mergehits.h
index 004f3cf5e1a..cbdda7e39bf 100644
--- a/searchcore/src/vespa/searchcore/fdispatch/search/mergehits.h
+++ b/searchcore/src/vespa/searchcore/fdispatch/search/mergehits.h
@@ -4,7 +4,6 @@
 
 #pragma once
 
-#include <vespa/fastos/fastos.h>
 #include <vespa/document/base/globalid.h>
 
 //-----------------------------------------------------------------------------
diff --git a/searchcore/src/vespa/searchcore/fdispatch/search/plain_dataset.h b/searchcore/src/vespa/searchcore/fdispatch/search/plain_dataset.h
index a8d849469a4..8d73a216431 100644
--- a/searchcore/src/vespa/searchcore/fdispatch/search/plain_dataset.h
+++ b/searchcore/src/vespa/searchcore/fdispatch/search/plain_dataset.h
@@ -6,7 +6,6 @@
 
 #include <list>
 
-#include <vespa/fastos/fastos.h>
 #include "child_info.h"
 #include <vespa/searchcore/fdispatch/search/dataset_base.h>
 #include <vespa/searchlib/util/rand48.h>
diff --git a/searchcore/src/vespa/searchcore/fdispatch/search/poss_count.h b/searchcore/src/vespa/searchcore/fdispatch/search/poss_count.h
index 53671e58de3..0ba99117d4f 100644
--- a/searchcore/src/vespa/searchcore/fdispatch/search/poss_count.h
+++ b/searchcore/src/vespa/searchcore/fdispatch/search/poss_count.h
@@ -2,7 +2,6 @@
 
 #pragma once
 
-#include <vespa/fastos/fastos.h>
 
 struct PossCount {
     bool valid;
diff --git a/searchcore/src/vespa/searchcore/proton/common/hw_info_sampler.cpp b/searchcore/src/vespa/searchcore/proton/common/hw_info_sampler.cpp
index 2c820b8e733..130e9731dec 100644
--- a/searchcore/src/vespa/searchcore/proton/common/hw_info_sampler.cpp
+++ b/searchcore/src/vespa/searchcore/proton/common/hw_info_sampler.cpp
@@ -7,6 +7,7 @@
 #include <vespa/searchcore/config/config-hwinfo.h>
 #include <vespa/config/print/fileconfigwriter.h>
 #include <vespa/vespalib/io/fileutil.h>
+#include <vespa/fastos/file.h>
 
 using config::ConfigHandle;
 using config::ConfigSubscriber;
diff --git a/searchcore/src/vespa/searchcore/proton/matching/querynodes.h b/searchcore/src/vespa/searchcore/proton/matching/querynodes.h
index 586ed86e568..e29fdb4630f 100644
--- a/searchcore/src/vespa/searchcore/proton/matching/querynodes.h
+++ b/searchcore/src/vespa/searchcore/proton/matching/querynodes.h
@@ -2,7 +2,6 @@
 
 #pragma once
 
-#include <vespa/fastos/fastos.h>
 #include <vespa/searchlib/queryeval/blueprint.h>
 #include <vespa/searchlib/fef/iindexenvironment.h>
 #include <vespa/searchlib/fef/itermdata.h>
diff --git a/searchcore/src/vespa/searchcore/proton/server/fileconfigmanager.cpp b/searchcore/src/vespa/searchcore/proton/server/fileconfigmanager.cpp
index c777f91d45b..3d56edd880d 100644
--- a/searchcore/src/vespa/searchcore/proton/server/fileconfigmanager.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/fileconfigmanager.cpp
@@ -12,6 +12,7 @@
 #include <vespa/config-rank-profiles.h>
 #include <vespa/searchsummary/config/config-juniperrc.h>
 #include <fstream>
+#include <vespa/fastos/file.h>
 #include <vespa/log/log.h>
 LOG_SETUP(".proton.server.fileconfigmanager");
 
diff --git a/searchcore/src/vespa/searchcore/util/eventloop.h b/searchcore/src/vespa/searchcore/util/eventloop.h
index 2bbb437675e..1858352b07f 100644
--- a/searchcore/src/vespa/searchcore/util/eventloop.h
+++ b/searchcore/src/vespa/searchcore/util/eventloop.h
@@ -4,7 +4,6 @@
 
 #pragma once
 
-#include <vespa/fastos/fastos.h>
 
 class FastS_TimeOut
 {
diff --git a/searchcore/src/vespa/searchcore/util/log.h b/searchcore/src/vespa/searchcore/util/log.h
index 873339a3253..0267e5d23e0 100644
--- a/searchcore/src/vespa/searchcore/util/log.h
+++ b/searchcore/src/vespa/searchcore/util/log.h
@@ -4,7 +4,6 @@
 
 #pragma once
 
-#include <vespa/fastos/fastos.h>
 
 /*
  * Define FastS_abort and FastS_assert macro's.