diff --git a/src/file_mrw.c b/src/file_mrw.c
index bd04033c..1210f071 100644
--- a/src/file_mrw.c
+++ b/src/file_mrw.c
@@ -33,7 +33,7 @@
 #include "filegen.h"
 #include "log.h"
 
-/*@ requires \valid(file_stat); */
+/*@ requires valid_register_header_check(file_stat); */
 static void register_header_check_mrw(file_stat_t *file_stat);
 
 const file_hint_t file_hint_mrw= {
@@ -74,14 +74,10 @@ struct prd {
 /* Minolta */
 /*@
   @ requires buffer_size >= 2*sizeof(struct hdr) + sizeof(struct prd);
-  @ 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_mrw, buffer+(..), 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;
-  @ ensures \result == 0 || \result == 1;
-  @ ensures  \result!=0 ==> valid_file_recovery(file_recovery_new);
   @*/
 static int header_check_mrw(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)
 {