diff --git a/setter/src/macos/attr.c b/setter/src/macos/attr.c
index c053387..797bbf3 100644
--- a/setter/src/macos/attr.c
+++ b/setter/src/macos/attr.c
@@ -29,25 +29,16 @@ Copyright (C) 2011-2021 Natalia Portillo
 
 #if defined(macintosh)
 
-#if defined(HAVE_ALIASES_H) || !defined(HAVE_MULTIVERSE_H)
-#include <Aliases.h>
-#endif
-
 #if defined(HAVE_FILE_TYPES_AND_CREATORS_H) || !defined(HAVE_MULTIVERSE_H)
 #include <FileTypesAndCreators.h>
 #endif
 
 #include <Files.h>
-#include <Gestalt.h>
 #include <MacTypes.h>
-#include <Resources.h>
-#include <TextUtils.h>
 #include <stdint.h>
 #include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
 
-#include "../include/consts.h"
 #include "../include/defs.h"
 #include "attr.h"
 #include "macos.h"
@@ -63,7 +54,6 @@ void FileAttributes(const char* path)
     FInfo        finderInfo;
     int32_t        count;
     HParamBlockRec fpb;
-    CInfoPBRec     cipbr;
     HParamBlockRec dirPB;
     int            i;
 
diff --git a/setter/src/macos/attr.h b/setter/src/macos/attr.h
index d9e92d5..0f62f16 100644
--- a/setter/src/macos/attr.h
+++ b/setter/src/macos/attr.h
@@ -5,6 +5,12 @@
 #ifndef SETTER_SRC_MACOS_ATTR_H_
 #define SETTER_SRC_MACOS_ATTR_H_
 
+#if defined(HAVE_FILE_TYPES_AND_CREATORS_H) || !defined(HAVE_MULTIVERSE_H)
+#include <FileTypesAndCreators.h>
+#endif
+
+#include <MacTypes.h>
+
 #include "macos.h"
 
 typedef struct
diff --git a/setter/src/macos/deleted.c b/setter/src/macos/deleted.c
index a419963..d921971 100644
--- a/setter/src/macos/deleted.c
+++ b/setter/src/macos/deleted.c
@@ -29,40 +29,28 @@ Copyright (C) 2011-2021 Natalia Portillo
 
 #if defined(macintosh)
 
-#if defined(HAVE_ALIASES_H) || !defined(HAVE_MULTIVERSE_H)
-#include <Aliases.h>
-#endif
-
 #if defined(HAVE_FILE_TYPES_AND_CREATORS_H) || !defined(HAVE_MULTIVERSE_H)
 #include <FileTypesAndCreators.h>
 #endif
 
 #include <Files.h>
-#include <Gestalt.h>
 #include <MacTypes.h>
-#include <Resources.h>
-#include <TextUtils.h>
 #include <stdint.h>
 #include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
 
-#include "../include/consts.h"
 #include "../include/defs.h"
 #include "macos.h"
 
 void DeleteFiles(const char* path)
 {
-    OSErr        rc, wRc, cRc;
+    OSErr        rc;
     Str255       str255;
     HVolumeParam hpb;
     int16_t      refNum;
-    int16_t      refFile;
     int32_t      dirId;
-    FInfo        finderInfo;
-    int32_t      count;
     char         filename[9];
-    int            pos = 0;
+    int            pos;
     HParamBlockRec dirPB;
 
     snprintf((char*)str255, 255, "%s", path);
diff --git a/setter/src/macos/dirdepth.c b/setter/src/macos/dirdepth.c
index 0249550..af8d33b 100644
--- a/setter/src/macos/dirdepth.c
+++ b/setter/src/macos/dirdepth.c
@@ -29,38 +29,22 @@ Copyright (C) 2011-2021 Natalia Portillo
 
 #if defined(macintosh)
 
-#if defined(HAVE_ALIASES_H) || !defined(HAVE_MULTIVERSE_H)
-#include <Aliases.h>
-#endif
-
-#if defined(HAVE_FILE_TYPES_AND_CREATORS_H) || !defined(HAVE_MULTIVERSE_H)
-#include <FileTypesAndCreators.h>
-#endif
-
 #include <Files.h>
-#include <Gestalt.h>
 #include <MacTypes.h>
-#include <Resources.h>
-#include <TextUtils.h>
 #include <stdint.h>
 #include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
 
-#include "../include/consts.h"
 #include "../include/defs.h"
 #include "macos.h"
 
 void DirectoryDepth(const char* path)
 {
-    OSErr        rc, wRc, cRc;
+    OSErr        rc;
     Str255       str255;
     HVolumeParam hpb;
     int16_t      refNum;
-    int16_t      refFile;
     int32_t      dirId;
-    FInfo        finderInfo;
-    int32_t      count;
     char         filename[9];
     int            pos = 0;
     HParamBlockRec dirPB;
@@ -92,8 +76,6 @@ void DirectoryDepth(const char* path)
         return;
     }
 
-    dirId = dirPB.fileParam.ioDirID;
-
     printf("Creating deepest directory tree.\n");
 
     while(!rc)
diff --git a/setter/src/macos/filename.c b/setter/src/macos/filename.c
index 4a559fe..568f9f9 100644
--- a/setter/src/macos/filename.c
+++ b/setter/src/macos/filename.c
@@ -29,22 +29,14 @@ Copyright (C) 2011-2021 Natalia Portillo
 
 #if defined(macintosh)
 
-#if defined(HAVE_ALIASES_H) || !defined(HAVE_MULTIVERSE_H)
-#include <Aliases.h>
-#endif
-
 #if defined(HAVE_FILE_TYPES_AND_CREATORS_H) || !defined(HAVE_MULTIVERSE_H)
 #include <FileTypesAndCreators.h>
 #endif
 
 #include <Files.h>
-#include <Gestalt.h>
 #include <MacTypes.h>
-#include <Resources.h>
-#include <TextUtils.h>
 #include <stdint.h>
 #include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
 
 #include "../include/consts.h"
diff --git a/setter/src/macos/files.c b/setter/src/macos/files.c
index 1e95126..a951074 100644
--- a/setter/src/macos/files.c
+++ b/setter/src/macos/files.c
@@ -29,22 +29,14 @@ Copyright (C) 2011-2021 Natalia Portillo
 
 #if defined(macintosh)
 
-#if defined(HAVE_ALIASES_H) || !defined(HAVE_MULTIVERSE_H)
-#include <Aliases.h>
-#endif
-
 #if defined(HAVE_FILE_TYPES_AND_CREATORS_H) || !defined(HAVE_MULTIVERSE_H)
 #include <FileTypesAndCreators.h>
 #endif
 
 #include <Files.h>
-#include <Gestalt.h>
 #include <MacTypes.h>
-#include <Resources.h>
-#include <TextUtils.h>
 #include <stdint.h>
 #include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
 
 #include "../include/consts.h"
diff --git a/setter/src/macos/frag.c b/setter/src/macos/frag.c
index 40e4418..96c4e0c 100644
--- a/setter/src/macos/frag.c
+++ b/setter/src/macos/frag.c
@@ -29,19 +29,12 @@ Copyright (C) 2011-2021 Natalia Portillo
 
 #if defined(macintosh)
 
-#if defined(HAVE_ALIASES_H) || !defined(HAVE_MULTIVERSE_H)
-#include <Aliases.h>
-#endif
-
 #if defined(HAVE_FILE_TYPES_AND_CREATORS_H) || !defined(HAVE_MULTIVERSE_H)
 #include <FileTypesAndCreators.h>
 #endif
 
 #include <Files.h>
-#include <Gestalt.h>
 #include <MacTypes.h>
-#include <Resources.h>
-#include <TextUtils.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/setter/src/macos/links.c b/setter/src/macos/links.c
index 8593744..ba1d340 100644
--- a/setter/src/macos/links.c
+++ b/setter/src/macos/links.c
@@ -41,20 +41,16 @@ Copyright (C) 2011-2021 Natalia Portillo
 #include <Gestalt.h>
 #include <MacTypes.h>
 #include <Resources.h>
-#include <TextUtils.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
-#include "../include/consts.h"
 #include "../include/defs.h"
 #include "links.h"
 #include "macos.h"
 
-static pascal OSErr
-
-    CreateAliasFile(const FSSpec* targetFile, const FSSpec* aliasFile, OSType fileCreator, OSType fileType)
+static pascal OSErr CreateAliasFile(FSSpec* targetFile, FSSpec* aliasFile, OSType fileCreator, OSType fileType)
 {
     short       rsrcID;
     short       aliasRefnum;
@@ -97,7 +93,7 @@ void Links(const char* path)
     int16_t      refFile;
     int32_t      dirId;
     char         filename[9];
-    int          pos = 0;
+    int          pos;
     FSSpec       targetSpec, aliasSpec;
     int32_t        count;
     HParamBlockRec dirPB;
diff --git a/setter/src/macos/links.h b/setter/src/macos/links.h
index 712ae39..7226b51 100644
--- a/setter/src/macos/links.h
+++ b/setter/src/macos/links.h
@@ -5,6 +5,15 @@
 #ifndef SETTER_SRC_MACOS_LINKS_H_
 #define SETTER_SRC_MACOS_LINKS_H_
 
+#if defined(HAVE_ALIASES_H) || !defined(HAVE_MULTIVERSE_H)
+#include <Aliases.h>
+#endif
+
+#include <Files.h>
+#include <MacTypes.h>
+
+static pascal OSErr CreateAliasFile(FSSpec* targetFile, FSSpec* aliasFile, OSType fileCreator, OSType fileType);
+
 const char* targetText = "This file is the target of an alias.\r";
 
 #endif // SETTER_SRC_MACOS_LINKS_H_
diff --git a/setter/src/macos/os.c b/setter/src/macos/os.c
index 35aa172..33f0926 100644
--- a/setter/src/macos/os.c
+++ b/setter/src/macos/os.c
@@ -29,25 +29,11 @@ Copyright (C) 2011-2021 Natalia Portillo
 
 #if defined(macintosh)
 
-#if defined(HAVE_ALIASES_H) || !defined(HAVE_MULTIVERSE_H)
-#include <Aliases.h>
-#endif
-
-#if defined(HAVE_FILE_TYPES_AND_CREATORS_H) || !defined(HAVE_MULTIVERSE_H)
-#include <FileTypesAndCreators.h>
-#endif
-
-#include <Files.h>
 #include <Gestalt.h>
 #include <MacTypes.h>
-#include <Resources.h>
-#include <TextUtils.h>
 #include <stdint.h>
 #include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
 
-#include "../include/consts.h"
 #include "../include/defs.h"
 #include "macos.h"
 
diff --git a/setter/src/macos/perms.c b/setter/src/macos/perms.c
index 520004f..7e9dc79 100644
--- a/setter/src/macos/perms.c
+++ b/setter/src/macos/perms.c
@@ -29,27 +29,7 @@ Copyright (C) 2011-2021 Natalia Portillo
 
 #if defined(macintosh)
 
-#if defined(HAVE_ALIASES_H) || !defined(HAVE_MULTIVERSE_H)
-#include <Aliases.h>
-#endif
-
-#if defined(HAVE_FILE_TYPES_AND_CREATORS_H) || !defined(HAVE_MULTIVERSE_H)
-#include <FileTypesAndCreators.h>
-#endif
-
-#include <Files.h>
-#include <Gestalt.h>
-#include <MacTypes.h>
-#include <Resources.h>
-#include <TextUtils.h>
-#include <stdint.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "../include/consts.h"
 #include "../include/defs.h"
-#include "macos.h"
 
 void FilePermissions(const char* path)
 { /* Do nothing, not supported by target operating system */
diff --git a/setter/src/macos/rsrcfork.c b/setter/src/macos/rsrcfork.c
index d211029..1c0266c 100644
--- a/setter/src/macos/rsrcfork.c
+++ b/setter/src/macos/rsrcfork.c
@@ -29,25 +29,17 @@ Copyright (C) 2011-2021 Natalia Portillo
 
 #if defined(macintosh)
 
-#if defined(HAVE_ALIASES_H) || !defined(HAVE_MULTIVERSE_H)
-#include <Aliases.h>
-#endif
-
 #if defined(HAVE_FILE_TYPES_AND_CREATORS_H) || !defined(HAVE_MULTIVERSE_H)
 #include <FileTypesAndCreators.h>
 #endif
 
 #include <Files.h>
-#include <Gestalt.h>
 #include <MacTypes.h>
 #include <Resources.h>
-#include <TextUtils.h>
 #include <stdint.h>
 #include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
 
-#include "../include/consts.h"
 #include "../include/defs.h"
 #include "macos.h"
 #include "rsrcfork.h"
@@ -101,7 +93,6 @@ void ResourceFork(const char* path)
     FInfo        finderInfo;
     int32_t        count;
     HParamBlockRec fpb;
-    CInfoPBRec     cipbr;
     HParamBlockRec dirPB;
 
     snprintf((char*)str255, 255, "%s", path);
diff --git a/setter/src/macos/rsrcfork.h b/setter/src/macos/rsrcfork.h
index a585f6d..e71ddc3 100644
--- a/setter/src/macos/rsrcfork.h
+++ b/setter/src/macos/rsrcfork.h
@@ -5,6 +5,15 @@
 #ifndef SETTER_SRC_MACOS_RSRCFORK_H_
 #define SETTER_SRC_MACOS_RSRCFORK_H_
 
+static OSErr SaveResourceToNewFile(int16_t        vRefNum,
+                                   int32_t        dirID,
+                                   Str255         filename,
+                                   ResType        type,
+                                   int16_t        resId,
+                                   Str255         resName,
+                                   unsigned char* buffer,
+                                   size_t         length);
+
 const char* rsrcText = "This file has a custom icon, a version, and a picture, in the resource fork.\r";
 
 const unsigned char IcnsResource[5618] = {
diff --git a/setter/src/macos/sparse.c b/setter/src/macos/sparse.c
index 699e018..5b2a01b 100644
--- a/setter/src/macos/sparse.c
+++ b/setter/src/macos/sparse.c
@@ -29,27 +29,7 @@ Copyright (C) 2011-2021 Natalia Portillo
 
 #if defined(macintosh)
 
-#if defined(HAVE_ALIASES_H) || !defined(HAVE_MULTIVERSE_H)
-#include <Aliases.h>
-#endif
-
-#if defined(HAVE_FILE_TYPES_AND_CREATORS_H) || !defined(HAVE_MULTIVERSE_H)
-#include <FileTypesAndCreators.h>
-#endif
-
-#include <Files.h>
-#include <Gestalt.h>
-#include <MacTypes.h>
-#include <Resources.h>
-#include <TextUtils.h>
-#include <stdint.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "../include/consts.h"
 #include "../include/defs.h"
-#include "macos.h"
 
 void Sparse(const char* path)
 { /* Do nothing, not supported by target operating system */
diff --git a/setter/src/macos/time.c b/setter/src/macos/time.c
index c147a9e..717d9a6 100644
--- a/setter/src/macos/time.c
+++ b/setter/src/macos/time.c
@@ -29,25 +29,15 @@ Copyright (C) 2011-2021 Natalia Portillo
 
 #if defined(macintosh)
 
-#if defined(HAVE_ALIASES_H) || !defined(HAVE_MULTIVERSE_H)
-#include <Aliases.h>
-#endif
-
 #if defined(HAVE_FILE_TYPES_AND_CREATORS_H) || !defined(HAVE_MULTIVERSE_H)
 #include <FileTypesAndCreators.h>
 #endif
 
 #include <Files.h>
-#include <Gestalt.h>
-#include <MacTypes.h>
-#include <Resources.h>
-#include <TextUtils.h>
 #include <stdint.h>
 #include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
 
-#include "../include/consts.h"
 #include "../include/defs.h"
 #include "macos.h"
 #include "time.h"
@@ -60,7 +50,6 @@ void Timestamps(const char* path)
     int16_t      refNum;
     int16_t      refFile;
     int32_t      dirId;
-    FInfo        finderInfo;
     int32_t      count;
     HFileInfo*   fpb;
     CInfoPBRec   cipbr;
diff --git a/setter/src/macos/volume.c b/setter/src/macos/volume.c
index 011287e..ae3ca08 100644
--- a/setter/src/macos/volume.c
+++ b/setter/src/macos/volume.c
@@ -29,25 +29,12 @@ Copyright (C) 2011-2021 Natalia Portillo
 
 #if defined(macintosh)
 
-#if defined(HAVE_ALIASES_H) || !defined(HAVE_MULTIVERSE_H)
-#include <Aliases.h>
-#endif
-
-#if defined(HAVE_FILE_TYPES_AND_CREATORS_H) || !defined(HAVE_MULTIVERSE_H)
-#include <FileTypesAndCreators.h>
-#endif
-
 #include <Files.h>
 #include <Gestalt.h>
 #include <MacTypes.h>
-#include <Resources.h>
-#include <TextUtils.h>
 #include <stdint.h>
 #include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
 
-#include "../include/consts.h"
 #include "../include/defs.h"
 #include "macos.h"
 
diff --git a/setter/src/macos/xattr.c b/setter/src/macos/xattr.c
index c47c64e..2809fdf 100644
--- a/setter/src/macos/xattr.c
+++ b/setter/src/macos/xattr.c
@@ -29,27 +29,7 @@ Copyright (C) 2011-2021 Natalia Portillo
 
 #if defined(macintosh)
 
-#if defined(HAVE_ALIASES_H) || !defined(HAVE_MULTIVERSE_H)
-#include <Aliases.h>
-#endif
-
-#if defined(HAVE_FILE_TYPES_AND_CREATORS_H) || !defined(HAVE_MULTIVERSE_H)
-#include <FileTypesAndCreators.h>
-#endif
-
-#include <Files.h>
-#include <Gestalt.h>
-#include <MacTypes.h>
-#include <Resources.h>
-#include <TextUtils.h>
-#include <stdint.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "../include/consts.h"
 #include "../include/defs.h"
-#include "macos.h"
 
 void ExtendedAttributes(const char* path)
 { /* Do nothing, not supported by target operating system */