2 files changed, 12 insertions, 4 deletions
diff --git a/config/src/apps/configproxy-cmd/proxycmd.cpp b/config/src/apps/configproxy-cmd/proxycmd.cpp
index 794c005f485..df37333f514 100644
--- a/config/src/apps/configproxy-cmd/proxycmd.cpp
+++ b/config/src/apps/configproxy-cmd/proxycmd.cpp
@@ -1,8 +1,12 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 #include "proxycmd.h"
-#include <iostream>
 #include <vespa/vespalib/util/stringfmt.h>
+#include <vespa/fnet/frt/supervisor.h>
+#include <vespa/fnet/frt/target.h>
+#include <vespa/fnet/frt/rpcrequest.h>
+
+#include <iostream>
 
 Flags::Flags(const Flags &) = default;
 Flags & Flags::operator=(const Flags &) = default;
diff --git a/config/src/apps/configproxy-cmd/proxycmd.h b/config/src/apps/configproxy-cmd/proxycmd.h
index a0ef02edaae..57b4d83fd42 100644
--- a/config/src/apps/configproxy-cmd/proxycmd.h
+++ b/config/src/apps/configproxy-cmd/proxycmd.h
@@ -1,7 +1,13 @@
 // 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/frt.h>
+#include <vespa/vespalib/stllike/string.h>
+#include <vector>
+
+class FRT_Supervisor;
+class FRT_Target;
+class FRT_RPCRequest;
+class FRT_Values;
 
 struct Flags {
     vespalib::string method;
@@ -30,9 +36,7 @@ private:
     void autoPrint();
 public:
     ProxyCmd(const Flags& flags);
-
     virtual ~ProxyCmd();
-
     int action();
 };