diff --git a/source4/kdc/kdc-glue.h b/source4/kdc/kdc-glue.h
index 88e7463348e..c083b8c6429 100644
--- a/source4/kdc/kdc-glue.h
+++ b/source4/kdc/kdc-glue.h
@@ -45,25 +45,6 @@ kdc_code kpasswdd_process(struct kdc_server *kdc,
 NTSTATUS hdb_samba4_create_kdc(struct samba_kdc_base_context *base_ctx,
 			       krb5_context context, struct HDB **db);
 
-/* from proxy.c */
-struct tevent_req *kdc_udp_proxy_send(TALLOC_CTX *mem_ctx,
-				      struct tevent_context *ev,
-				      struct kdc_server *kdc,
-				      uint16_t port,
-				      DATA_BLOB in);
-NTSTATUS kdc_udp_proxy_recv(struct tevent_req *req,
-			    TALLOC_CTX *mem_ctx,
-			    DATA_BLOB *out);
-
-struct tevent_req *kdc_tcp_proxy_send(TALLOC_CTX *mem_ctx,
-				      struct tevent_context *ev,
-				      struct kdc_server *kdc,
-				      uint16_t port,
-				      DATA_BLOB in);
-NTSTATUS kdc_tcp_proxy_recv(struct tevent_req *req,
-			    TALLOC_CTX *mem_ctx,
-			    DATA_BLOB *out);
-
 /* from kdc-glue.c */
 int kdc_check_pac(krb5_context krb5_context,
 		  DATA_BLOB server_sig,
diff --git a/source4/kdc/kdc-heimdal.c b/source4/kdc/kdc-heimdal.c
index a0c5d314f27..493b30b8425 100644
--- a/source4/kdc/kdc-heimdal.c
+++ b/source4/kdc/kdc-heimdal.c
@@ -32,6 +32,7 @@
 #include "lib/socket/netif.h"
 #include "param/param.h"
 #include "kdc/kdc-server.h"
+#include "kdc/kdc-proxy.h"
 #include "kdc/kdc-glue.h"
 #include "kdc/pac-glue.h"
 #include "dsdb/samdb/samdb.h"
diff --git a/source4/kdc/kdc-proxy.c b/source4/kdc/kdc-proxy.c
index aca85d7b81b..5072835fa19 100644
--- a/source4/kdc/kdc-proxy.c
+++ b/source4/kdc/kdc-proxy.c
@@ -28,7 +28,7 @@
 #include "lib/util/tevent_ntstatus.h"
 #include "lib/stream/packet.h"
 #include "kdc/kdc-server.h"
-#include "kdc/kdc-glue.h"
+#include "kdc/kdc-proxy.h"
 #include "dsdb/samdb/samdb.h"
 #include "libcli/composite/composite.h"
 #include "libcli/resolve/resolve.h"
diff --git a/source4/kdc/kdc-proxy.h b/source4/kdc/kdc-proxy.h
new file mode 100644
index 00000000000..1ebe8daf304
--- /dev/null
+++ b/source4/kdc/kdc-proxy.h
@@ -0,0 +1,45 @@
+/*
+   Unix SMB/CIFS implementation.
+
+   KDC related functions
+
+   Copyright (c) 2005-2008 Andrew Bartlett <abartlet@samba.org>
+   Copyright (c) 2005             Andrew Tridgell <tridge@samba.org>
+   Copyright (c) 2005             Stefan Metzmacher <metze@samba.org>
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef _KDC_PROXY_H
+#define _KDC_PROXY_H
+
+struct tevent_req *kdc_udp_proxy_send(TALLOC_CTX *mem_ctx,
+				      struct tevent_context *ev,
+				      struct kdc_server *kdc,
+				      uint16_t port,
+				      DATA_BLOB in);
+NTSTATUS kdc_udp_proxy_recv(struct tevent_req *req,
+			    TALLOC_CTX *mem_ctx,
+			    DATA_BLOB *out);
+
+struct tevent_req *kdc_tcp_proxy_send(TALLOC_CTX *mem_ctx,
+				      struct tevent_context *ev,
+				      struct kdc_server *kdc,
+				      uint16_t port,
+				      DATA_BLOB in);
+NTSTATUS kdc_tcp_proxy_recv(struct tevent_req *req,
+			    TALLOC_CTX *mem_ctx,
+			    DATA_BLOB *out);
+
+#endif /* _KDC_PROXY_H */