diff --git a/dhcpd.h b/dhcpd.h
index de7e7548..d307a828 100644
--- a/dhcpd.h
+++ b/dhcpd.h
@@ -243,24 +243,24 @@ void readconf PROTO ((void));
 void read_leases PROTO ((void));
 void parse_statement PROTO ((FILE *));
 void skip_to_semi PROTO ((FILE *));
-struct host_decl *parse_host_statement PROTO ((FILE *, jmp_buf *));
-char *parse_host_name PROTO ((FILE *, jmp_buf *));
-void parse_class_statement PROTO ((FILE *, jmp_buf *, int));
-void parse_class_decl PROTO ((FILE *, jmp_buf *, struct class *));
-struct subnet *parse_subnet_statement PROTO ((FILE *, jmp_buf *));
-void parse_subnet_decl PROTO ((FILE *, jmp_buf *, struct subnet *));
-void parse_host_decl PROTO ((FILE *, jmp_buf *, struct host_decl *));
-void parse_hardware_decl PROTO ((FILE *, jmp_buf *, struct host_decl *));
-struct hardware parse_hardware_addr PROTO ((FILE *, jmp_buf *));
-char *parse_filename_decl PROTO ((FILE *, jmp_buf *));
-struct tree *parse_ip_addr_or_hostname PROTO ((FILE *, jmp_buf *, int));
-void parse_fixed_addr_decl PROTO ((FILE *, jmp_buf *, struct host_decl *));
-void parse_option_decl PROTO ((FILE *, jmp_buf *, struct tree_cache **));
-TIME parse_timestamp PROTO ((FILE *, jmp_buf *));
-TIME parse_date PROTO ((FILE *, jmp_buf *));
-struct lease *parse_lease_statement PROTO ((FILE *, jmp_buf *));
-void parse_address_range PROTO ((FILE *, jmp_buf *, struct subnet *));
-unsigned char *parse_numeric_aggregate PROTO ((FILE *, jmp_buf *,
+struct host_decl *parse_host_statement PROTO ((FILE *, jrefproto));
+char *parse_host_name PROTO ((FILE *, jrefproto));
+void parse_class_statement PROTO ((FILE *, jrefproto, int));
+void parse_class_decl PROTO ((FILE *, jrefproto, struct class *));
+struct subnet *parse_subnet_statement PROTO ((FILE *, jrefproto));
+void parse_subnet_decl PROTO ((FILE *, jrefproto, struct subnet *));
+void parse_host_decl PROTO ((FILE *, jrefproto, struct host_decl *));
+void parse_hardware_decl PROTO ((FILE *, jrefproto, struct host_decl *));
+struct hardware parse_hardware_addr PROTO ((FILE *, jrefproto));
+char *parse_filename_decl PROTO ((FILE *, jrefproto));
+struct tree *parse_ip_addr_or_hostname PROTO ((FILE *, jrefproto, int));
+void parse_fixed_addr_decl PROTO ((FILE *, jrefproto, struct host_decl *));
+void parse_option_decl PROTO ((FILE *, jrefproto, struct tree_cache **));
+TIME parse_timestamp PROTO ((FILE *, jrefproto));
+TIME parse_date PROTO ((FILE *, jrefproto));
+struct lease *parse_lease_statement PROTO ((FILE *, jrefproto));
+void parse_address_range PROTO ((FILE *, jrefproto, struct subnet *));
+unsigned char *parse_numeric_aggregate PROTO ((FILE *, jrefproto,
 					       unsigned char *, int *,
 					       int, int, int));
 void convert_num PROTO ((unsigned char *, char *, int, int));
diff --git a/includes/dhcpd.h b/includes/dhcpd.h
index de7e7548..d307a828 100644
--- a/includes/dhcpd.h
+++ b/includes/dhcpd.h
@@ -243,24 +243,24 @@ void readconf PROTO ((void));
 void read_leases PROTO ((void));
 void parse_statement PROTO ((FILE *));
 void skip_to_semi PROTO ((FILE *));
-struct host_decl *parse_host_statement PROTO ((FILE *, jmp_buf *));
-char *parse_host_name PROTO ((FILE *, jmp_buf *));
-void parse_class_statement PROTO ((FILE *, jmp_buf *, int));
-void parse_class_decl PROTO ((FILE *, jmp_buf *, struct class *));
-struct subnet *parse_subnet_statement PROTO ((FILE *, jmp_buf *));
-void parse_subnet_decl PROTO ((FILE *, jmp_buf *, struct subnet *));
-void parse_host_decl PROTO ((FILE *, jmp_buf *, struct host_decl *));
-void parse_hardware_decl PROTO ((FILE *, jmp_buf *, struct host_decl *));
-struct hardware parse_hardware_addr PROTO ((FILE *, jmp_buf *));
-char *parse_filename_decl PROTO ((FILE *, jmp_buf *));
-struct tree *parse_ip_addr_or_hostname PROTO ((FILE *, jmp_buf *, int));
-void parse_fixed_addr_decl PROTO ((FILE *, jmp_buf *, struct host_decl *));
-void parse_option_decl PROTO ((FILE *, jmp_buf *, struct tree_cache **));
-TIME parse_timestamp PROTO ((FILE *, jmp_buf *));
-TIME parse_date PROTO ((FILE *, jmp_buf *));
-struct lease *parse_lease_statement PROTO ((FILE *, jmp_buf *));
-void parse_address_range PROTO ((FILE *, jmp_buf *, struct subnet *));
-unsigned char *parse_numeric_aggregate PROTO ((FILE *, jmp_buf *,
+struct host_decl *parse_host_statement PROTO ((FILE *, jrefproto));
+char *parse_host_name PROTO ((FILE *, jrefproto));
+void parse_class_statement PROTO ((FILE *, jrefproto, int));
+void parse_class_decl PROTO ((FILE *, jrefproto, struct class *));
+struct subnet *parse_subnet_statement PROTO ((FILE *, jrefproto));
+void parse_subnet_decl PROTO ((FILE *, jrefproto, struct subnet *));
+void parse_host_decl PROTO ((FILE *, jrefproto, struct host_decl *));
+void parse_hardware_decl PROTO ((FILE *, jrefproto, struct host_decl *));
+struct hardware parse_hardware_addr PROTO ((FILE *, jrefproto));
+char *parse_filename_decl PROTO ((FILE *, jrefproto));
+struct tree *parse_ip_addr_or_hostname PROTO ((FILE *, jrefproto, int));
+void parse_fixed_addr_decl PROTO ((FILE *, jrefproto, struct host_decl *));
+void parse_option_decl PROTO ((FILE *, jrefproto, struct tree_cache **));
+TIME parse_timestamp PROTO ((FILE *, jrefproto));
+TIME parse_date PROTO ((FILE *, jrefproto));
+struct lease *parse_lease_statement PROTO ((FILE *, jrefproto));
+void parse_address_range PROTO ((FILE *, jrefproto, struct subnet *));
+unsigned char *parse_numeric_aggregate PROTO ((FILE *, jrefproto,
 					       unsigned char *, int *,
 					       int, int, int));
 void convert_num PROTO ((unsigned char *, char *, int, int));