diff --git a/setter/src/beos/CMakeLists.txt b/setter/src/beos/CMakeLists.txt
index 12b0e6d..84dc683 100644
--- a/setter/src/beos/CMakeLists.txt
+++ b/setter/src/beos/CMakeLists.txt
@@ -26,4 +26,4 @@ if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "BeOS|Haiku")
     return()
 endif()
 
-add_sources(attr.c deleted.c dirdepth.c filename.c files.c frag.c links.c os.c perms.c perms.h rsrcfork.c sparse.c time.c time.h volume.c volume.h xattr.c xattr.h)
+add_sources(attr.c deleted.c dirdepth.c filename.c files.c frag.c links.c os.c perms.c perms.h rsrcfork.c sparse.c time.c beostime.h volume.c volume.h xattr.c xattr.h)
diff --git a/setter/src/beos/time.h b/setter/src/beos/beostime.h
similarity index 72%
rename from setter/src/beos/time.h
rename to setter/src/beos/beostime.h
index 154b7f2..d459a2e 100644
--- a/setter/src/beos/time.h
+++ b/setter/src/beos/beostime.h
@@ -39,26 +39,20 @@ Copyright (C) 2011-2021 Natalia Portillo
 
 typedef struct
 {
-  char*   filename;
-  time_t access;
-  time_t modification;
-  char    type[13];
-  char    message[32];
+    char*  filename;
+    time_t access;
+    time_t modification;
+    char   type[13];
+    char   message[32];
 } beos_time_tests_t;
 
 #define KNOWN_BEOS_TIMES 10
 
 static const beos_time_tests_t beos_times[KNOWN_BEOS_TIMES] = {
-    "MAXATIME", MAXTIMESTAMP, 0, "access", MAXDATETIME,
-    "MAXMTIME", 0, MAXTIMESTAMP, "modification", MAXDATETIME,
-    "MINATIME", MINTIMESTAMP, 0, "access", MINDATETIME,
-    "MINMTIME", 0, MINTIMESTAMP, "modification", MINDATETIME,
-    "Y1KATIME", Y1KTIMESTAMP, 0, "access", Y1KDATETIME,
-    "Y1KMTIME", 0, Y1KTIMESTAMP, "modification", Y1KDATETIME,
-    "Y2KATIME", Y2KTIMESTAMP, 0, "access", Y2KDATETIME,
-    "Y2KMTIME", 0, Y2KTIMESTAMP, "modification", Y2KDATETIME,
-    "LESSATIME", LESSTIMESTAMP, 0, "access", LESSDATETIME,
-    "LESSMTIME", 0, LESSTIMESTAMP, "modification", LESSDATETIME
-};
+    "MAXATIME",  MAXTIMESTAMP,  0, "access", MAXDATETIME,  "MAXMTIME",  0, MAXTIMESTAMP,  "modification", MAXDATETIME,
+    "MINATIME",  MINTIMESTAMP,  0, "access", MINDATETIME,  "MINMTIME",  0, MINTIMESTAMP,  "modification", MINDATETIME,
+    "Y1KATIME",  Y1KTIMESTAMP,  0, "access", Y1KDATETIME,  "Y1KMTIME",  0, Y1KTIMESTAMP,  "modification", Y1KDATETIME,
+    "Y2KATIME",  Y2KTIMESTAMP,  0, "access", Y2KDATETIME,  "Y2KMTIME",  0, Y2KTIMESTAMP,  "modification", Y2KDATETIME,
+    "LESSATIME", LESSTIMESTAMP, 0, "access", LESSDATETIME, "LESSMTIME", 0, LESSTIMESTAMP, "modification", LESSDATETIME};
 
 #endif // AARU_FSTESTER_SETTER_SRC_BEOS_TIME_H_
diff --git a/setter/src/beos/time.c b/setter/src/beos/time.c
index b8d4ba1..b5d1aff 100644
--- a/setter/src/beos/time.c
+++ b/setter/src/beos/time.c
@@ -30,10 +30,9 @@ Copyright (C) 2011-2021 Natalia Portillo
 #include <unistd.h>
 #include <utime.h>
 
-#include "time.h"
-
 #include "../include/defs.h"
 #include "../log.h"
+#include "beostime.h"
 
 void Timestamps(const char* path)
 {