-#ifndef HEADER_FILEHDR_H
-#define HEADER_FILEHDR_H 1
+#ifndef FILESYS_FILEHDR_H
+#define FILESYS_FILEHDR_H
#include <stdbool.h>
#include <stddef.h>
-#include "disk.h"
-#include "off_t.h"
+#include "filesys/off_t.h"
+#include "devices/disk.h"
/* Number of direct sector pointers in a file header. */
#define DIRECT_CNT ((DISK_SECTOR_SIZE - sizeof (off_t) * 2) \
off_t filehdr_length (const struct filehdr *);
void filehdr_print (const struct filehdr *);
-#endif /* filehdr.h */
+#endif /* filesys/filehdr.h */