Index: samba-4.1.3+dfsg/source4/heimdal_build/krb5-types.h
===================================================================
--- samba-4.1.3+dfsg.orig/source4/heimdal_build/krb5-types.h	2013-06-13 04:21:02.000000000 -0500
+++ /dev/null	1970-01-01 00:00:00.000000000 +0000
@@ -1,14 +0,0 @@
-/* krb5-types.h -- this file was generated for i686-pc-linux-gnu by
-                   $Id: bits.c,v 1.23 2005/01/05 15:22:02 lha Exp $ */
-
-#ifndef __krb5_types_h__
-#define __krb5_types_h__
-
-#include "replace.h"
-#include "system/network.h"
-
-typedef socklen_t krb5_socklen_t;
-typedef int krb5_socket_t;
-typedef ssize_t krb5_ssize_t;
-
-#endif /* __krb5_types_h__ */
Index: samba-4.1.3+dfsg/source4/rpc_server/backupkey/dcesrv_backupkey.c
===================================================================
--- samba-4.1.3+dfsg.orig/source4/rpc_server/backupkey/dcesrv_backupkey.c	2013-06-13 04:21:02.000000000 -0500
+++ samba-4.1.3+dfsg/source4/rpc_server/backupkey/dcesrv_backupkey.c	2014-01-07 06:06:59.000000000 -0600
@@ -972,7 +972,7 @@
 static WERROR generate_bkrp_cert(TALLOC_CTX *ctx, struct dcesrv_call_state *dce_call, struct ldb_context *ldb_ctx, const char *dn)
 {
 
-	struct heim_octet_string data;
+	heim_octet_string data;
 	WERROR w_err;
 	RSA *rsa;
 	hx509_context hctx;