diff --git a/nfs4/Makefile.am b/nfs4/Makefile.am
index d93240b..8a8a66d 100644
--- a/nfs4/Makefile.am
+++ b/nfs4/Makefile.am
@@ -28,7 +28,8 @@ compile_rpc:
 -e "s/#define NFS3_COOKIEVERFSIZE 8/#define NFS3_COOKIEVERFSIZE 8\n\n/g" \
 -e "s/ CLIENT / void /g" \
 -e "s/SVCXPRT /void /g" \
--e "s/bool_t/uint32_t/g" >> libnfs-raw-nfs4.h
+-e "s/bool_t/uint32_t/g" | head --lines=-5 >>libnfs-raw-nfs4.h
+	cat libnfs-raw-nfs4.h.extra >>libnfs-raw-nfs4.h
 	cat nfs4.x | head -16 >libnfs-raw-nfs4.c
 	rpcgen -c nfs4.x | sed \
 -e "s/#include \".*nfs4.h\"/#include \"libnfs-xdr.h\"\n#include \"libnfs-raw-nfs4.h\"/" \
diff --git a/nfs4/libnfs-raw-nfs4.h b/nfs4/libnfs-raw-nfs4.h
index 5b2e6f2..091977e 100644
--- a/nfs4/libnfs-raw-nfs4.h
+++ b/nfs4/libnfs-raw-nfs4.h
@@ -2798,4 +2798,3 @@ EXTERN void nfs4_acl_free(fattr4_acl *nfs4acl);
 #endif
 
 #endif /* !_NFS4_H_RPCGEN */
-  
diff --git a/nfs4/libnfs-raw-nfs4.h.extra b/nfs4/libnfs-raw-nfs4.h.extra
index ca605dd..5266726 100644
--- a/nfs4/libnfs-raw-nfs4.h.extra
+++ b/nfs4/libnfs-raw-nfs4.h.extra
@@ -41,3 +41,9 @@ EXTERN int nfs4_getacl(struct nfs_context *nfs, struct nfsfh *nfsfh,
                        fattr4_acl *nfs4acl);
 
 EXTERN void nfs4_acl_free(fattr4_acl *nfs4acl);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* !_NFS4_H_RPCGEN */