diff --git a/src/file_pgdump.c b/src/file_pgdump.c
index d173e9b6..162c8cfb 100644
--- a/src/file_pgdump.c
+++ b/src/file_pgdump.c
@@ -83,7 +83,7 @@ struct pgdmp_hdr
   /* PG_VERSION */
 } __attribute__ ((gcc_struct, __packed__));
 
-/*@ requires \valid(file_stat); */
+/*@ requires valid_register_header_check(file_stat); */
 static void register_header_check_pgdump(file_stat_t *file_stat);
 
 const file_hint_t file_hint_pgdump= {
@@ -97,13 +97,9 @@ const file_hint_t file_hint_pgdump= {
 
 /*@
   @ requires buffer_size >= sizeof(struct pgdmp_hdr);
-  @ requires \valid_read(buffer+(0..buffer_size-1));
-  @ requires valid_file_recovery(file_recovery);
-  @ requires \valid(file_recovery_new);
-  @ requires file_recovery_new->blocksize > 0;
   @ requires separation: \separated(&file_hint_pgdump, buffer+(..), file_recovery, file_recovery_new);
-  @ ensures \result == 0 || \result == 1;
-  @ ensures  \result!=0 ==> valid_file_recovery(file_recovery_new);
+  @ requires valid_header_check_param(buffer, buffer_size, safe_header_only, file_recovery, file_recovery_new);
+  @ ensures  valid_header_check_result(\result, file_recovery_new);
   @ assigns  *file_recovery_new;
   @*/
 static int header_check_pgdump(const unsigned char *buffer, const unsigned int buffer_size, const unsigned int safe_header_only, const file_recovery_t *file_recovery, file_recovery_t *file_recovery_new)