4 files changed, 17 insertions, 8 deletions
diff --git a/src/cache/backings/file.c b/src/cache/backings/file.c
index f421623..9b905ac 100644
--- a/src/cache/backings/file.c
+++ b/src/cache/backings/file.c
@@ -1,7 +1,5 @@
-#include "../range.h"
-
 #include "file.h"
-#include "file_common.c"
+#include "file_common.h"
 
 static void file_backing_lock(struct cch_backing *backing)
 {
diff --git a/src/cache/backings/file.h b/src/cache/backings/file.h
index 9ffd650..06daac9 100644
--- a/src/cache/backings/file.h
+++ b/src/cache/backings/file.h
@@ -12,8 +12,8 @@ struct cch_backing_file {
     struct nn_file file;
     off_t size;
     union {
-        void *map; // CACHE_BACKING_MAPPED
         off_t pointer; // CACHE_BACKING_READ
+        void *map;     // CACHE_BACKING_MAPPED
     } u;
     struct nn_mutex mutex;
 };
diff --git a/src/cache/backings/file_common.c b/src/cache/backings/file_common.h
index e8bd2ca..98bd420 100644
--- a/src/cache/backings/file_common.c
+++ b/src/cache/backings/file_common.h
@@ -1,3 +1,12 @@
+#pragma once
+
+#include "../backing.h"
+#include "../range.h"
+
+#include "file.h"
+
+AL_UNUSED_FUNCTION_PUSH
+
 static off_t file_backing_get_size_estimate(struct cch_backing *backing)
 {
     struct cch_backing_file *file = (struct cch_backing_file *)backing;
@@ -10,7 +19,9 @@ static off_t file_backing_get_size_estimate(struct cch_backing *backing)
 static bool file_open_internal(struct cch_backing_file *file, str *path, size_t size)
 {
     s32 flags = size != 0 ? NNWT_FILE_CREATE : NNWT_FILE_READONLY;
-    if (!nn_file_open(&file->file, path, flags)) return false;
+    if (!nn_file_open(&file->file, path, flags)) {
+        return false;
+    }
     if (!size) {
         file->size = file->file.size;
         cch_backing_fill_range(&file->backing, 0, file->size);
@@ -22,3 +33,5 @@ static bool file_open_internal(struct cch_backing_file *file, str *path, size_t
     }
     return true;
 }
+
+AL_UNUSED_FUNCTION_POP
diff --git a/src/cache/backings/file_mapped.c b/src/cache/backings/file_mapped.c
index e13d602..17620d0 100644
--- a/src/cache/backings/file_mapped.c
+++ b/src/cache/backings/file_mapped.c
@@ -1,7 +1,5 @@
-#include "../range.h"
-
 #include "file.h"
-#include "file_common.c"
+#include "file_common.h"
 
 static void file_backing_lock(struct cch_backing *backing)
 {