Removed frt.h from header files to reduce include volume.

4 files changed, 6 insertions, 18 deletions

diff --git a/frtstream/src/vespa/frtstream/frtclientstream.cpp b/frtstream/src/vespa/frtstream/frtclientstream.cpp
index 142b0d1fda0..e9e17b8e02b 100644
--- a/frtstream/src/vespa/frtstream/frtclientstream.cpp
+++ b/frtstream/src/vespa/frtstream/frtclientstream.cpp
@@ -1,6 +1,8 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 #include "frtclientstream.h"
+#include <vespa/fnet/frt/target.h>
+#include <vespa/fnet/frt/rpcrequest.h>
 
 using namespace fnet;
 
diff --git a/frtstream/src/vespa/frtstream/frtclientstream.h b/frtstream/src/vespa/frtstream/frtclientstream.h
index b47f1399d0f..b06a6af890d 100644
--- a/frtstream/src/vespa/frtstream/frtclientstream.h
+++ b/frtstream/src/vespa/frtstream/frtclientstream.h
@@ -2,16 +2,11 @@
 
 #pragma once
 
-//Requires gcc 3 or higher
-#if ! defined(__GNUC__) || (__GNUC__ > 2)
-
-
-#include <vespa/frtstream/frtstream.h>
-
+#include "frtstream.h"
+#include <vespa/fnet/frt/supervisor.h>
 
 namespace frtstream {
 
-
 class FrtClientStream : public FrtStream {
     FRT_Supervisor supervisor;
     FRT_RPCRequest* request;
@@ -34,7 +29,3 @@ public:
 
 } //end namespace frtstream
 
-#else
-#error "Requires gcc 3 or higher"
-#endif
-
diff --git a/frtstream/src/vespa/frtstream/frtstream.h b/frtstream/src/vespa/frtstream/frtstream.h
index cd50b1eae32..43bcf1aa8f1 100644
--- a/frtstream/src/vespa/frtstream/frtstream.h
+++ b/frtstream/src/vespa/frtstream/frtstream.h
@@ -1,17 +1,15 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 #pragma once
 
+#include <vespa/fnet/frt/values.h>
 #include <string>
 #include <memory>
 #include <algorithm>
 #include <iosfwd>
 #include <iterator>
 
-#include <vespa/fastos/types.h>
-#include <vespa/fnet/frt/frt.h>
-
-
 namespace frtstream {
+
 class ConnectionException{};
 class InvokationException{
 public:
@@ -85,8 +83,6 @@ public:
 };
 
 
-
-
 } //end namespace frtstream
 
 
diff --git a/frtstream/src/vespa/frtstream/frtstreamTemplateImp.hpp b/frtstream/src/vespa/frtstream/frtstreamTemplateImp.hpp
index 4577f8a7e78..0f89b42e401 100644
--- a/frtstream/src/vespa/frtstream/frtstreamTemplateImp.hpp
+++ b/frtstream/src/vespa/frtstream/frtstreamTemplateImp.hpp
@@ -5,7 +5,6 @@
 //Can be moved when(if ever) the export functionality
 //is implemented in the target compiler.
 
-
 namespace frtstream {
 
 template<class U>