diff --git a/setter/src/dos/attr.c b/setter/src/dos/attr.c
index 55fbe0f..23a65fd 100644
--- a/setter/src/dos/attr.c
+++ b/setter/src/dos/attr.c
@@ -27,8 +27,6 @@ Contains DOS code
 Copyright (C) 2011-2021 Natalia Portillo
 *****************************************************************************/
 
-#if defined(__DOS__) || defined(MSDOS)
-
 #include <dos.h>
 #include <stdio.h>
 #include <string.h>
@@ -87,5 +85,3 @@ void FileAttributes(const char* path)
                cRc);
     }
 }
-
-#endif
diff --git a/setter/src/dos/attr.h b/setter/src/dos/attr.h
index ecc5646..785f548 100644
--- a/setter/src/dos/attr.h
+++ b/setter/src/dos/attr.h
@@ -27,8 +27,6 @@ Contains DOS definitions
 Copyright (C) 2011-2021 Natalia Portillo
 *****************************************************************************/
 
-#if defined(__DOS__) || defined(MSDOS)
-
 #ifndef SETTER_SRC_DOS_ATTR_H_
 #define SETTER_SRC_DOS_ATTR_H_
 
@@ -114,5 +112,3 @@ static const dos_attr_tests_t dos_attrs[KNOWN_DOS_ATTRS] = {
 };
 
 #endif // SETTER_SRC_DOS_ATTR_H_
-
-#endif
\ No newline at end of file
diff --git a/setter/src/dos/deleted.c b/setter/src/dos/deleted.c
index 8903f96..877037d 100644
--- a/setter/src/dos/deleted.c
+++ b/setter/src/dos/deleted.c
@@ -27,8 +27,6 @@ Contains DOS code
 Copyright (C) 2011-2021 Natalia Portillo
 *****************************************************************************/
 
-#if defined(__DOS__) || defined(MSDOS)
-
 #include <dos.h>
 #include <stdio.h>
 #include <string.h>
@@ -79,5 +77,3 @@ void DeleteFiles(const char* path)
         unlink(filename);
     }
 }
-
-#endif
diff --git a/setter/src/dos/dirdepth.c b/setter/src/dos/dirdepth.c
index 2cde2b7..7fc0fad 100644
--- a/setter/src/dos/dirdepth.c
+++ b/setter/src/dos/dirdepth.c
@@ -27,8 +27,6 @@ Contains DOS code
 Copyright (C) 2011-2021 Natalia Portillo
 *****************************************************************************/
 
-#if defined(__DOS__) || defined(MSDOS)
-
 #include <dos.h>
 #include <stdio.h>
 #include <string.h>
@@ -80,5 +78,3 @@ void DirectoryDepth(const char* path)
 
     printf("\tCreated %d levels of directory hierarchy\n", pos);
 }
-
-#endif
diff --git a/setter/src/dos/filename.c b/setter/src/dos/filename.c
index 9b93de8..e0b90f1 100644
--- a/setter/src/dos/filename.c
+++ b/setter/src/dos/filename.c
@@ -27,8 +27,6 @@ Contains DOS code
 Copyright (C) 2011-2021 Natalia Portillo
 *****************************************************************************/
 
-#if defined(__DOS__) || defined(MSDOS)
-
 #include <dos.h>
 #include <stdio.h>
 #include <string.h>
@@ -84,5 +82,3 @@ void Filenames(const char* path)
         printf("\tFile name = \"%s\", rc = %d, wRc = %d, cRc = %d\n", filenames[pos], rc, wRc, cRc);
     }
 }
-
-#endif
diff --git a/setter/src/dos/files.c b/setter/src/dos/files.c
index 5dc92dc..9b5b63d 100644
--- a/setter/src/dos/files.c
+++ b/setter/src/dos/files.c
@@ -27,8 +27,6 @@ Contains DOS code
 Copyright (C) 2011-2021 Natalia Portillo
 *****************************************************************************/
 
-#if defined(__DOS__) || defined(MSDOS)
-
 #include <dos.h>
 #include <stdio.h>
 #include <string.h>
@@ -80,5 +78,3 @@ void MillionFiles(const char* path)
 
     printf("\tCreated %d files\n", pos);
 }
-
-#endif
diff --git a/setter/src/dos/frag.c b/setter/src/dos/frag.c
index 1f695e3..74d9897 100644
--- a/setter/src/dos/frag.c
+++ b/setter/src/dos/frag.c
@@ -27,8 +27,6 @@ Contains DOS code
 Copyright (C) 2011-2021 Natalia Portillo
 *****************************************************************************/
 
-#if defined(__DOS__) || defined(MSDOS)
-
 #include <dos.h>
 #include <io.h>
 #include <stdio.h>
@@ -252,5 +250,3 @@ void Fragmentation(const char* path, size_t clusterSize)
            wRc,
            cRc);
 }
-
-#endif
diff --git a/setter/src/dos/links.c b/setter/src/dos/links.c
index cc33ef8..4c8832d 100644
--- a/setter/src/dos/links.c
+++ b/setter/src/dos/links.c
@@ -27,12 +27,8 @@ Contains DOS code
 Copyright (C) 2011-2021 Natalia Portillo
 *****************************************************************************/
 
-#if defined(__DOS__) || defined(MSDOS)
-
 #include "../include/defs.h"
 
 void Links(const char* path)
 { /* Do nothing, not supported by target operating system */
 }
-
-#endif
diff --git a/setter/src/dos/os.c b/setter/src/dos/os.c
index 9b4cace..5afdcdf 100644
--- a/setter/src/dos/os.c
+++ b/setter/src/dos/os.c
@@ -27,8 +27,6 @@ Contains DOS code
 Copyright (C) 2011-2021 Natalia Portillo
 *****************************************************************************/
 
-#if defined(__DOS__) || defined(MSDOS)
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -107,5 +105,3 @@ void GetOsInfo()
             break;
     }
 }
-
-#endif
diff --git a/setter/src/dos/perms.c b/setter/src/dos/perms.c
index 3550edd..fc3998c 100644
--- a/setter/src/dos/perms.c
+++ b/setter/src/dos/perms.c
@@ -27,12 +27,8 @@ Contains DOS code
 Copyright (C) 2011-2021 Natalia Portillo
 *****************************************************************************/
 
-#if defined(__DOS__) || defined(MSDOS)
-
 #include "../include/defs.h"
 
 void FilePermissions(const char* path)
 { /* Do nothing, not supported by target operating system */
 }
-
-#endif
diff --git a/setter/src/dos/rsrcfork.c b/setter/src/dos/rsrcfork.c
index f3a0057..dc438e0 100644
--- a/setter/src/dos/rsrcfork.c
+++ b/setter/src/dos/rsrcfork.c
@@ -27,12 +27,8 @@ Contains DOS code
 Copyright (C) 2011-2021 Natalia Portillo
 *****************************************************************************/
 
-#if defined(__DOS__) || defined(MSDOS)
-
 #include "../include/defs.h"
 
 void ResourceFork(const char* path)
 { /* Do nothing, not supported by target operating system */
 }
-
-#endif
diff --git a/setter/src/dos/sparse.c b/setter/src/dos/sparse.c
index 8d4205e..d3f016a 100644
--- a/setter/src/dos/sparse.c
+++ b/setter/src/dos/sparse.c
@@ -27,12 +27,8 @@ Contains DOS code
 Copyright (C) 2011-2021 Natalia Portillo
 *****************************************************************************/
 
-#if defined(__DOS__) || defined(MSDOS)
-
 #include "../include/defs.h"
 
 void Sparse(const char* path)
 { /* Do nothing, not supported by target operating system */
 }
-
-#endif
diff --git a/setter/src/dos/time.c b/setter/src/dos/time.c
index 4531bba..ad880c9 100644
--- a/setter/src/dos/time.c
+++ b/setter/src/dos/time.c
@@ -27,8 +27,6 @@ Contains DOS code
 Copyright (C) 2011-2021 Natalia Portillo
 *****************************************************************************/
 
-#if defined(__DOS__) || defined(MSDOS)
-
 #include <dos.h>
 #include <stdio.h>
 #include <string.h>
@@ -103,5 +101,3 @@ void Timestamps(const char* path)
             "\tFile name = \"%s\", rc = %d, wRc = %d, cRc = %d, tRc = %d\n", dos_times[i].filename, rc, wRc, cRc, tRc);
     }
 }
-
-#endif
diff --git a/setter/src/dos/time.h b/setter/src/dos/time.h
index ce8ee70..9134296 100644
--- a/setter/src/dos/time.h
+++ b/setter/src/dos/time.h
@@ -27,8 +27,6 @@ Contains DOS definitions
 Copyright (C) 2011-2021 Natalia Portillo
 *****************************************************************************/
 
-#if defined(__DOS__) || defined(MSDOS)
-
 #ifndef SETTER_SRC_DOS_TIME_H_
 #define SETTER_SRC_DOS_TIME_H_
 
@@ -73,5 +71,3 @@ static const dos_time_tests_t dos_times[KNOWN_DOS_TIMES] = {
 };
 
 #endif // SETTER_SRC_DOS_TIME_H_
-
-#endif
\ No newline at end of file
diff --git a/setter/src/dos/volume.c b/setter/src/dos/volume.c
index 251783e..ac0b1b8 100644
--- a/setter/src/dos/volume.c
+++ b/setter/src/dos/volume.c
@@ -27,8 +27,6 @@ Contains DOS code
 Copyright (C) 2011-2021 Natalia Portillo
 *****************************************************************************/
 
-#if defined(__DOS__) || defined(MSDOS)
-
 #include <dos.h>
 #include <errno.h>
 #include <io.h>
@@ -85,5 +83,3 @@ void GetVolumeInfo(const char* path, size_t* clusterSize)
         *clusterSize = freeSpace.sectorsPerCluster * freeSpace.bytesPerSector;
     }
 }
-
-#endif
diff --git a/setter/src/dos/xattr.c b/setter/src/dos/xattr.c
index 79c13e6..6ee08ab 100644
--- a/setter/src/dos/xattr.c
+++ b/setter/src/dos/xattr.c
@@ -27,12 +27,8 @@ Contains DOS code
 Copyright (C) 2011-2021 Natalia Portillo
 *****************************************************************************/
 
-#if defined(__DOS__) || defined(MSDOS)
-
 #include "../include/defs.h"
 
 void ExtendedAttributes(const char* path)
 { /* Do nothing, not supported by target operating system */
 }
-
-#endif
diff --git a/setter/src/linux/attr.c b/setter/src/linux/attr.c
index ad0980e..f426593 100644
--- a/setter/src/linux/attr.c
+++ b/setter/src/linux/attr.c
@@ -27,8 +27,6 @@ Contains Linux implementations
 Copyright (C) 2011-2021 Natalia Portillo
 *****************************************************************************/
 
-#if defined(__linux__) || defined(__LINUX__) || defined(__gnu_linux)
-
 #include <errno.h>
 #include <linux/fs.h>
 #include <stdio.h>
@@ -115,5 +113,3 @@ void LinuxFileAttributes(const char* path)
         printf("\t%s, rc = %d, wRc = %d, sRc = %d, cRc = %d\n", linux_attrs[i].description, rc, wRc, sRc, cRc);
     }
 }
-
-#endif
\ No newline at end of file
diff --git a/setter/src/linux/linux.h b/setter/src/linux/linux.h
index 997a830..9d3975c 100644
--- a/setter/src/linux/linux.h
+++ b/setter/src/linux/linux.h
@@ -30,8 +30,6 @@ Copyright (C) 2011-2021 Natalia Portillo
 #ifndef SETTER_LINUX_H
 #define SETTER_LINUX_H
 
-#if defined(__linux__) || defined(__LINUX__) || defined(__gnu_linux)
-
 void LinuxExtendedAttributes(const char* path);
 void LinuxSparse(const char* path);
 void LinuxFileAttributes(const char* path);
@@ -231,5 +229,3 @@ static unsigned char IconEA[3516] = {
     0x00};
 
 #endif
-
-#endif // SETTER_LINUX_H
\ No newline at end of file
diff --git a/setter/src/linux/sparse.c b/setter/src/linux/sparse.c
index 745d389..100c708 100644
--- a/setter/src/linux/sparse.c
+++ b/setter/src/linux/sparse.c
@@ -27,8 +27,6 @@ Contains Linux implementations
 Copyright (C) 2011-2021 Natalia Portillo
 *****************************************************************************/
 
-#if defined(__linux__) || defined(__LINUX__) || defined(__gnu_linux)
-
 #include "../include/consts.h"
 #define _GNU_SOURCE
 #include <errno.h>
@@ -152,5 +150,3 @@ void LinuxSparse(const char* path)
            cRc,
            zRc);
 }
-
-#endif
\ No newline at end of file
diff --git a/setter/src/linux/xattr.c b/setter/src/linux/xattr.c
index 560f1ec..0f76348 100644
--- a/setter/src/linux/xattr.c
+++ b/setter/src/linux/xattr.c
@@ -27,8 +27,6 @@ Contains Linux implementations
 Copyright (C) 2011-2021 Natalia Portillo
 *****************************************************************************/
 
-#if defined(__linux__) || defined(__LINUX__) || defined(__gnu_linux)
-
 #include <errno.h>
 #include <features.h>
 #include <stdio.h>
@@ -105,5 +103,3 @@ void LinuxExtendedAttributes(const char* path)
     printf("\tFile with an extended attribute called \"com.ibm.os2.icon\", rc = %d, cRc = %d\n", rc, cRc);
 #endif
 }
-
-#endif
\ No newline at end of file
diff --git a/setter/src/macos/attr.c b/setter/src/macos/attr.c
index cb2c6b1..42d1596 100644
--- a/setter/src/macos/attr.c
+++ b/setter/src/macos/attr.c
@@ -27,8 +27,6 @@ Contains Mac OS code.
 Copyright (C) 2011-2021 Natalia Portillo
 *****************************************************************************/
 
-#if defined(macintosh)
-
 #if defined(HAVE_FILE_TYPES_AND_CREATORS_H) || !defined(HAVE_MULTIVERSE_H)
 #include <FileTypesAndCreators.h>
 #endif
@@ -130,4 +128,3 @@ void FileAttributes(const char* path)
                cRc);
     }
 }
-#endif
diff --git a/setter/src/macos/deleted.c b/setter/src/macos/deleted.c
index dd8b02a..16f4800 100644
--- a/setter/src/macos/deleted.c
+++ b/setter/src/macos/deleted.c
@@ -27,8 +27,6 @@ Contains Mac OS code.
 Copyright (C) 2011-2021 Natalia Portillo
 *****************************************************************************/
 
-#if defined(macintosh)
-
 #if defined(HAVE_FILE_TYPES_AND_CREATORS_H) || !defined(HAVE_MULTIVERSE_H)
 #include <FileTypesAndCreators.h>
 #endif
@@ -98,4 +96,3 @@ void DeleteFiles(const char* path)
         HDelete(refNum, dirId, str255);
     }
 }
-#endif
diff --git a/setter/src/macos/dirdepth.c b/setter/src/macos/dirdepth.c
index 7b6b386..108e322 100644
--- a/setter/src/macos/dirdepth.c
+++ b/setter/src/macos/dirdepth.c
@@ -27,8 +27,6 @@ Contains Mac OS code.
 Copyright (C) 2011-2021 Natalia Portillo
 *****************************************************************************/
 
-#if defined(macintosh)
-
 #include <Files.h>
 #include <MacTypes.h>
 #include <stdint.h>
@@ -103,4 +101,3 @@ void DirectoryDepth(const char* path)
 
     printf("\tCreated %d levels of directory hierarchy\n", pos);
 }
-#endif
diff --git a/setter/src/macos/filename.c b/setter/src/macos/filename.c
index a51bf0e..bebcce7 100644
--- a/setter/src/macos/filename.c
+++ b/setter/src/macos/filename.c
@@ -27,8 +27,6 @@ Contains Mac OS code.
 Copyright (C) 2011-2021 Natalia Portillo
 *****************************************************************************/
 
-#if defined(macintosh)
-
 #if defined(HAVE_FILE_TYPES_AND_CREATORS_H) || !defined(HAVE_MULTIVERSE_H)
 #include <FileTypesAndCreators.h>
 #endif
@@ -113,4 +111,3 @@ void Filenames(const char* path)
         printf("\tFile name = \"%s\", rc = %d, wRc = %d, cRc = %d\n", filenames[pos], rc, wRc, cRc);
     }
 }
-#endif
diff --git a/setter/src/macos/files.c b/setter/src/macos/files.c
index f6e2792..6afd391 100644
--- a/setter/src/macos/files.c
+++ b/setter/src/macos/files.c
@@ -27,8 +27,6 @@ Contains Mac OS code.
 Copyright (C) 2011-2021 Natalia Portillo
 *****************************************************************************/
 
-#if defined(macintosh)
-
 #if defined(HAVE_FILE_TYPES_AND_CREATORS_H) || !defined(HAVE_MULTIVERSE_H)
 #include <FileTypesAndCreators.h>
 #endif
@@ -102,4 +100,3 @@ void MillionFiles(const char* path)
 
     printf("\tCreated %d files\n", pos);
 }
-#endif
diff --git a/setter/src/macos/frag.c b/setter/src/macos/frag.c
index 96c4e0c..8c861de 100644
--- a/setter/src/macos/frag.c
+++ b/setter/src/macos/frag.c
@@ -27,8 +27,6 @@ Contains Mac OS code.
 Copyright (C) 2011-2021 Natalia Portillo
 *****************************************************************************/
 
-#if defined(macintosh)
-
 #if defined(HAVE_FILE_TYPES_AND_CREATORS_H) || !defined(HAVE_MULTIVERSE_H)
 #include <FileTypesAndCreators.h>
 #endif
@@ -312,5 +310,3 @@ void Fragmentation(const char* path, size_t clusterSize)
            wRc,
            cRc);
 }
-
-#endif
diff --git a/setter/src/macos/links.c b/setter/src/macos/links.c
index f3e91fc..ff08e39 100644
--- a/setter/src/macos/links.c
+++ b/setter/src/macos/links.c
@@ -27,8 +27,6 @@ Contains Mac OS code.
 Copyright (C) 2011-2021 Natalia Portillo
 *****************************************************************************/
 
-#if defined(macintosh)
-
 #if defined(HAVE_ALIASES_H) || !defined(HAVE_MULTIVERSE_H)
 #include <Aliases.h>
 #endif
@@ -175,4 +173,3 @@ void Links(const char* path)
 
     printf("pos = %d, rc = %d, wRc = %d, cRc = %d, oRc = %d, aRc = %d\n", pos, rc, wRc, cRc, oRc, aRc);
 }
-#endif
diff --git a/setter/src/macos/macos.h b/setter/src/macos/macos.h
index 691adb8..b522150 100644
--- a/setter/src/macos/macos.h
+++ b/setter/src/macos/macos.h
@@ -27,8 +27,6 @@ Contains Mac OS definitions.
 Copyright (C) 2011-2021 Natalia Portillo
 *****************************************************************************/
 
-#if defined(macintosh)
-
 #ifndef AARU_FSTESTER_SETTER_MACINTOSH_H
 #define AARU_FSTESTER_SETTER_MACINTOSH_H
 
@@ -50,5 +48,3 @@ enum
 };
 
 #endif
-
-#endif
\ No newline at end of file
diff --git a/setter/src/macos/os.c b/setter/src/macos/os.c
index 33f0926..cef7a3a 100644
--- a/setter/src/macos/os.c
+++ b/setter/src/macos/os.c
@@ -27,8 +27,6 @@ Contains Mac OS code.
 Copyright (C) 2011-2021 Natalia Portillo
 *****************************************************************************/
 
-#if defined(macintosh)
-
 #include <Gestalt.h>
 #include <MacTypes.h>
 #include <stdint.h>
@@ -74,4 +72,3 @@ void GetOsInfo()
         if(!rc) { printf("Running under Classic.\n"); }
     }
 }
-#endif
diff --git a/setter/src/macos/perms.c b/setter/src/macos/perms.c
index 7e9dc79..756bded 100644
--- a/setter/src/macos/perms.c
+++ b/setter/src/macos/perms.c
@@ -27,11 +27,8 @@ Contains Mac OS code.
 Copyright (C) 2011-2021 Natalia Portillo
 *****************************************************************************/
 
-#if defined(macintosh)
-
 #include "../include/defs.h"
 
 void FilePermissions(const char* path)
 { /* Do nothing, not supported by target operating system */
 }
-#endif
diff --git a/setter/src/macos/rsrcfork.c b/setter/src/macos/rsrcfork.c
index fd4159d..3e10b3e 100644
--- a/setter/src/macos/rsrcfork.c
+++ b/setter/src/macos/rsrcfork.c
@@ -27,8 +27,6 @@ Contains Mac OS code.
 Copyright (C) 2011-2021 Natalia Portillo
 *****************************************************************************/
 
-#if defined(macintosh)
-
 #if defined(HAVE_FILE_TYPES_AND_CREATORS_H) || !defined(HAVE_MULTIVERSE_H)
 #include <FileTypesAndCreators.h>
 #endif
@@ -297,4 +295,3 @@ void ResourceFork(const char* path)
            rRc2,
            rRc3);
 }
-#endif
diff --git a/setter/src/macos/sparse.c b/setter/src/macos/sparse.c
index 5b2a01b..f34edaf 100644
--- a/setter/src/macos/sparse.c
+++ b/setter/src/macos/sparse.c
@@ -27,11 +27,8 @@ Contains Mac OS code.
 Copyright (C) 2011-2021 Natalia Portillo
 *****************************************************************************/
 
-#if defined(macintosh)
-
 #include "../include/defs.h"
 
 void Sparse(const char* path)
 { /* Do nothing, not supported by target operating system */
 }
-#endif
diff --git a/setter/src/macos/time.c b/setter/src/macos/time.c
index 818699a..5cb3e69 100644
--- a/setter/src/macos/time.c
+++ b/setter/src/macos/time.c
@@ -27,8 +27,6 @@ Contains Mac OS code.
 Copyright (C) 2011-2021 Natalia Portillo
 *****************************************************************************/
 
-#if defined(macintosh)
-
 #if defined(HAVE_FILE_TYPES_AND_CREATORS_H) || !defined(HAVE_MULTIVERSE_H)
 #include <FileTypesAndCreators.h>
 #endif
@@ -126,4 +124,3 @@ void Timestamps(const char* path)
         printf("\tFile name = \"%s\", rc = %d, wRc = %d, cRc = %d, tRc = %d\n", str255, rc, wRc, cRc, tRc);
     }
 }
-#endif
diff --git a/setter/src/macos/volume.c b/setter/src/macos/volume.c
index ae3ca08..73f0fa4 100644
--- a/setter/src/macos/volume.c
+++ b/setter/src/macos/volume.c
@@ -27,8 +27,6 @@ Contains Mac OS code.
 Copyright (C) 2011-2021 Natalia Portillo
 *****************************************************************************/
 
-#if defined(macintosh)
-
 #include <Files.h>
 #include <Gestalt.h>
 #include <MacTypes.h>
@@ -145,5 +143,3 @@ void GetVolumeInfo(const char* path, size_t* clusterSize)
         default: printf("unknown id 0x%04X\n", fsId); break;
     }
 }
-
-#endif
diff --git a/setter/src/macos/xattr.c b/setter/src/macos/xattr.c
index 2809fdf..00bb839 100644
--- a/setter/src/macos/xattr.c
+++ b/setter/src/macos/xattr.c
@@ -27,11 +27,8 @@ Contains Mac OS code.
 Copyright (C) 2011-2021 Natalia Portillo
 *****************************************************************************/
 
-#if defined(macintosh)
-
 #include "../include/defs.h"
 
 void ExtendedAttributes(const char* path)
 { /* Do nothing, not supported by target operating system */
 }
-#endif
diff --git a/setter/src/netware/attr.c b/setter/src/netware/attr.c
index 65cdbe7..f5309ea 100644
--- a/setter/src/netware/attr.c
+++ b/setter/src/netware/attr.c
@@ -27,9 +27,6 @@ Contains DOS code
 Copyright (C) 2011-2021 Natalia Portillo
 *****************************************************************************/
 
-#if defined(__NETWARE_386__)
-
-#include "../include/consts.h"
 #include "../include/defs.h"
 #include "netware.h"
 
@@ -37,5 +34,3 @@ void FileAttributes(const char* path)
 {
     // TODO: Implement
 }
-
-#endif
diff --git a/setter/src/netware/deleted.c b/setter/src/netware/deleted.c
index 0f4580c..26f92ac 100644
--- a/setter/src/netware/deleted.c
+++ b/setter/src/netware/deleted.c
@@ -27,9 +27,6 @@ Contains DOS code
 Copyright (C) 2011-2021 Natalia Portillo
 *****************************************************************************/
 
-#if defined(__NETWARE_386__)
-
-#include "../include/consts.h"
 #include "../include/defs.h"
 #include "netware.h"
 
@@ -37,5 +34,3 @@ void DeleteFiles(const char* path)
 {
     // TODO: Implement
 }
-
-#endif
diff --git a/setter/src/netware/dirdepth.c b/setter/src/netware/dirdepth.c
index 740e858..363e1af 100644
--- a/setter/src/netware/dirdepth.c
+++ b/setter/src/netware/dirdepth.c
@@ -27,9 +27,6 @@ Contains DOS code
 Copyright (C) 2011-2021 Natalia Portillo
 *****************************************************************************/
 
-#if defined(__NETWARE_386__)
-
-#include "../include/consts.h"
 #include "../include/defs.h"
 #include "netware.h"
 
@@ -37,5 +34,3 @@ void DirectoryDepth(const char* path)
 {
     // TODO: Implement
 }
-
-#endif
diff --git a/setter/src/netware/filename.c b/setter/src/netware/filename.c
index 6b0e902..e32c55b 100644
--- a/setter/src/netware/filename.c
+++ b/setter/src/netware/filename.c
@@ -27,8 +27,6 @@ Contains DOS code
 Copyright (C) 2011-2021 Natalia Portillo
 *****************************************************************************/
 
-#if defined(__NETWARE_386__)
-
 #include "../include/consts.h"
 #include "../include/defs.h"
 #include "netware.h"
@@ -37,5 +35,3 @@ void Filenames(const char* path)
 {
     // TODO: Implement
 }
-
-#endif
diff --git a/setter/src/netware/files.c b/setter/src/netware/files.c
index 13e3e15..efc1ee6 100644
--- a/setter/src/netware/files.c
+++ b/setter/src/netware/files.c
@@ -27,9 +27,6 @@ Contains DOS code
 Copyright (C) 2011-2021 Natalia Portillo
 *****************************************************************************/
 
-#if defined(__NETWARE_386__)
-
-#include "../include/consts.h"
 #include "../include/defs.h"
 #include "netware.h"
 
@@ -37,5 +34,3 @@ void MillionFiles(const char* path)
 {
     // TODO: Implement
 }
-
-#endif
diff --git a/setter/src/netware/frag.c b/setter/src/netware/frag.c
index c1ed7d4..f343ddf 100644
--- a/setter/src/netware/frag.c
+++ b/setter/src/netware/frag.c
@@ -27,9 +27,6 @@ Contains DOS code
 Copyright (C) 2011-2021 Natalia Portillo
 *****************************************************************************/
 
-#if defined(__NETWARE_386__)
-
-#include "../include/consts.h"
 #include "../include/defs.h"
 #include "netware.h"
 
@@ -37,5 +34,3 @@ void Fragmentation(const char* path, size_t clusterSize)
 {
     // TODO: Implement
 }
-
-#endif
diff --git a/setter/src/netware/links.c b/setter/src/netware/links.c
index 2c3ad40..e24bf48 100644
--- a/setter/src/netware/links.c
+++ b/setter/src/netware/links.c
@@ -27,9 +27,6 @@ Contains DOS code
 Copyright (C) 2011-2021 Natalia Portillo
 *****************************************************************************/
 
-#if defined(__NETWARE_386__)
-
-#include "../include/consts.h"
 #include "../include/defs.h"
 #include "netware.h"
 
@@ -37,5 +34,3 @@ void Links(const char* path)
 {
     // TODO: Implement
 }
-
-#endif
diff --git a/setter/src/netware/netware.h b/setter/src/netware/netware.h
index 1f254fc..2764fc2 100644
--- a/setter/src/netware/netware.h
+++ b/setter/src/netware/netware.h
@@ -27,11 +27,7 @@ Contains DOS definitions
 Copyright (C) 2011-2021 Natalia Portillo
 *****************************************************************************/
 
-#if defined(__NETWARE_386__)
-
 #ifndef AARU_FSTESTER_SETTER_NETWARE_H
 #define AARU_FSTESTER_SETTER_NETWARE_H
 
 #endif
-
-#endif
diff --git a/setter/src/netware/os.c b/setter/src/netware/os.c
index 6e235c9..0b551d8 100644
--- a/setter/src/netware/os.c
+++ b/setter/src/netware/os.c
@@ -27,9 +27,6 @@ Contains DOS code
 Copyright (C) 2011-2021 Natalia Portillo
 *****************************************************************************/
 
-#if defined(__NETWARE_386__)
-
-#include "../include/consts.h"
 #include "../include/defs.h"
 #include "netware.h"
 
@@ -37,5 +34,3 @@ void GetOsInfo()
 {
     // TODO: Implement
 }
-
-#endif
diff --git a/setter/src/netware/perms.c b/setter/src/netware/perms.c
index b0a6241..9d93909 100644
--- a/setter/src/netware/perms.c
+++ b/setter/src/netware/perms.c
@@ -27,9 +27,6 @@ Contains DOS code
 Copyright (C) 2011-2021 Natalia Portillo
 *****************************************************************************/
 
-#if defined(__NETWARE_386__)
-
-#include "../include/consts.h"
 #include "../include/defs.h"
 #include "netware.h"
 
@@ -37,5 +34,3 @@ void FilePermissions(const char* path)
 {
     // TODO: Implement
 }
-
-#endif
diff --git a/setter/src/netware/rsrcfork.c b/setter/src/netware/rsrcfork.c
index 26fb6a8..77a8df0 100644
--- a/setter/src/netware/rsrcfork.c
+++ b/setter/src/netware/rsrcfork.c
@@ -27,9 +27,6 @@ Contains DOS code
 Copyright (C) 2011-2021 Natalia Portillo
 *****************************************************************************/
 
-#if defined(__NETWARE_386__)
-
-#include "../include/consts.h"
 #include "../include/defs.h"
 #include "netware.h"
 
@@ -37,5 +34,3 @@ void ResourceFork(const char* path)
 {
     // TODO: Implement
 }
-
-#endif
diff --git a/setter/src/netware/sparse.c b/setter/src/netware/sparse.c
index 59892d7..f153b34 100644
--- a/setter/src/netware/sparse.c
+++ b/setter/src/netware/sparse.c
@@ -27,9 +27,6 @@ Contains DOS code
 Copyright (C) 2011-2021 Natalia Portillo
 *****************************************************************************/
 
-#if defined(__NETWARE_386__)
-
-#include "../include/consts.h"
 #include "../include/defs.h"
 #include "netware.h"
 
@@ -37,5 +34,3 @@ void Sparse(const char* path)
 {
     // TODO: Implement
 }
-
-#endif
diff --git a/setter/src/netware/time.c b/setter/src/netware/time.c
index a0228bb..e74488a 100644
--- a/setter/src/netware/time.c
+++ b/setter/src/netware/time.c
@@ -27,9 +27,6 @@ Contains DOS code
 Copyright (C) 2011-2021 Natalia Portillo
 *****************************************************************************/
 
-#if defined(__NETWARE_386__)
-
-#include "../include/consts.h"
 #include "../include/defs.h"
 #include "netware.h"
 
@@ -37,5 +34,3 @@ void Timestamps(const char* path)
 {
     // TODO: Implement
 }
-
-#endif
diff --git a/setter/src/netware/volume.c b/setter/src/netware/volume.c
index 1b0aeb8..b8f3875 100644
--- a/setter/src/netware/volume.c
+++ b/setter/src/netware/volume.c
@@ -27,9 +27,6 @@ Contains DOS code
 Copyright (C) 2011-2021 Natalia Portillo
 *****************************************************************************/
 
-#if defined(__NETWARE_386__)
-
-#include "../include/consts.h"
 #include "../include/defs.h"
 #include "netware.h"
 
@@ -38,5 +35,3 @@ void GetVolumeInfo(const char* path, size_t* clusterSize)
     // TODO: Implement
     *clusterSize = 0;
 }
-
-#endif
diff --git a/setter/src/netware/xattr.c b/setter/src/netware/xattr.c
index 6ff9a84..9d384f4 100644
--- a/setter/src/netware/xattr.c
+++ b/setter/src/netware/xattr.c
@@ -27,9 +27,6 @@ Contains DOS code
 Copyright (C) 2011-2021 Natalia Portillo
 *****************************************************************************/
 
-#if defined(__NETWARE_386__)
-
-#include "../include/consts.h"
 #include "../include/defs.h"
 #include "netware.h"
 
@@ -37,5 +34,3 @@ void ExtendedAttributes(const char* path)
 {
     // TODO: Implement
 }
-
-#endif
diff --git a/setter/src/os2/16bit/os.c b/setter/src/os2/16bit/os.c
index f5ab90d..44a7597 100644
--- a/setter/src/os2/16bit/os.c
+++ b/setter/src/os2/16bit/os.c
@@ -27,9 +27,6 @@ Contains 16-bit OS/2 code
 Copyright (C) 2011-2021 Natalia Portillo
 *****************************************************************************/
 
-#if(defined(__I86__) || defined(__i86__) || defined(_M_I86)) && (defined(__OS2__) || defined(__os2__)) &&              \
-    !defined(__DOS__)
-
 #define INCL_DOSMISC
 #define INCL_DOSFILEMGR
 
@@ -74,5 +71,3 @@ void GetOsInfo()
 
     printf("\tMaximum path is %d bytes.\n", pathLen[0]);
 }
-
-#endif
diff --git a/setter/src/os2/16bit/xattr.c b/setter/src/os2/16bit/xattr.c
index 8673547..2512ca6 100644
--- a/setter/src/os2/16bit/xattr.c
+++ b/setter/src/os2/16bit/xattr.c
@@ -27,9 +27,6 @@ Contains 16-bit OS/2 code
 Copyright (C) 2011-2021 Natalia Portillo
 *****************************************************************************/
 
-#if(defined(__I86__) || defined(__i86__) || defined(_M_I86)) && (defined(__OS2__) || defined(__os2__)) &&              \
-    !defined(__DOS__)
-
 #define INCL_DOSMISC
 #define INCL_DOSFILEMGR
 
@@ -147,5 +144,3 @@ void ExtendedAttributes(const char* path)
 
     printf("\tFile with icon = \"%s\", rc = %d, wRc = %d, cRc = %d\n", "ICON", rc, wRc, cRc);
 }
-
-#endif
diff --git a/setter/src/os2/32bit/os.c b/setter/src/os2/32bit/os.c
index fcd627b..e9b01ec 100644
--- a/setter/src/os2/32bit/os.c
+++ b/setter/src/os2/32bit/os.c
@@ -27,9 +27,6 @@ Contains 32-bit OS/2 code
 Copyright (C) 2011-2021 Natalia Portillo
 *****************************************************************************/
 
-#if(defined(__I386__) || defined(__i386__) || defined(__THW_INTEL) || defined(_M_I386)) &&                             \
-    (defined(__OS2__) || defined(__os2__)) && !defined(__DOS__)
-
 #define INCL_DOSMISC
 #define INCL_DOSFILEMGR
 
@@ -79,5 +76,3 @@ void GetOsInfo()
 
     printf("\tMaximum path is %lu bytes.\n", pathLen[0]);
 }
-
-#endif
diff --git a/setter/src/os2/32bit/xattr.c b/setter/src/os2/32bit/xattr.c
index b24b543..8f1c16c 100644
--- a/setter/src/os2/32bit/xattr.c
+++ b/setter/src/os2/32bit/xattr.c
@@ -27,9 +27,6 @@ Contains 32-bit OS/2 code
 Copyright (C) 2011-2021 Natalia Portillo
 *****************************************************************************/
 
-#if(defined(__I386__) || defined(__i386__) || defined(__THW_INTEL) || defined(_M_I386)) &&                             \
-    (defined(__OS2__) || defined(__os2__)) && !defined(__DOS__)
-
 #define INCL_DOSMISC
 #define INCL_DOSFILEMGR
 
@@ -45,5 +42,3 @@ Copyright (C) 2011-2021 Natalia Portillo
 void ExtendedAttributes(const char* path)
 { /* TODO: Implement */
 }
-
-#endif
diff --git a/setter/src/os2/deleted.c b/setter/src/os2/deleted.c
index 6a1767f..bd180d0 100644
--- a/setter/src/os2/deleted.c
+++ b/setter/src/os2/deleted.c
@@ -27,8 +27,6 @@ Contains 16-bit OS/2 code
 Copyright (C) 2011-2021 Natalia Portillo
 *****************************************************************************/
 
-#if((defined(__OS2__) || defined(__os2__)) && !defined(__DOS__)
-
 #define INCL_DOSMISC
 #define INCL_DOSFILEMGR
 
@@ -93,5 +91,3 @@ void DeleteFiles(const char* path)
         __os2_delete(&filename);
     }
 }
-
-#endif
diff --git a/setter/src/os2/dirdepth.c b/setter/src/os2/dirdepth.c
index 9abb86c..0fc42a4 100644
--- a/setter/src/os2/dirdepth.c
+++ b/setter/src/os2/dirdepth.c
@@ -27,8 +27,6 @@ Contains 16-bit OS/2 code
 Copyright (C) 2011-2021 Natalia Portillo
 *****************************************************************************/
 
-#if((defined(__OS2__) || defined(__os2__)) && !defined(__DOS__)
-
 #define INCL_DOSMISC
 #define INCL_DOSFILEMGR
 
@@ -86,5 +84,3 @@ void DirectoryDepth(const char* path)
 
     printf("\tCreated %d levels of directory hierarchy\n", pos);
 }
-
-#endif
diff --git a/setter/src/os2/filename.c b/setter/src/os2/filename.c
index beac669..685eac9 100644
--- a/setter/src/os2/filename.c
+++ b/setter/src/os2/filename.c
@@ -27,8 +27,6 @@ Contains 16-bit OS/2 code
 Copyright (C) 2011-2021 Natalia Portillo
 *****************************************************************************/
 
-#if((defined(__OS2__) || defined(__os2__)) && !defined(__DOS__)
-
 #define INCL_DOSMISC
 #define INCL_DOSFILEMGR
 
@@ -97,5 +95,3 @@ void Filenames(const char* path)
         printf("\tFile name = \"%s\", rc = %d, wRc = %d, cRc = %d\n", filenames[pos], rc, wRc, cRc);
     }
 }
-
-#endif
diff --git a/setter/src/os2/files.c b/setter/src/os2/files.c
index 7cdc800..8ca790f 100644
--- a/setter/src/os2/files.c
+++ b/setter/src/os2/files.c
@@ -27,8 +27,6 @@ Contains 16-bit OS/2 code
 Copyright (C) 2011-2021 Natalia Portillo
 *****************************************************************************/
 
-#if((defined(__OS2__) || defined(__os2__)) && !defined(__DOS__)
-
 #define INCL_DOSMISC
 #define INCL_DOSFILEMGR
 
@@ -94,5 +92,3 @@ void MillionFiles(const char* path)
 
     printf("\tCreated %lu files\n", pos);
 }
-
-#endif
diff --git a/setter/src/os2/frag.c b/setter/src/os2/frag.c
index 6dad31f..0119b43 100644
--- a/setter/src/os2/frag.c
+++ b/setter/src/os2/frag.c
@@ -27,8 +27,6 @@ Contains 16-bit OS/2 code
 Copyright (C) 2011-2021 Natalia Portillo
 *****************************************************************************/
 
-#if((defined(__OS2__) || defined(__os2__)) && !defined(__DOS__)
-
 #define INCL_DOSMISC
 #define INCL_DOSFILEMGR
 
@@ -326,5 +324,3 @@ void Fragmentation(const char* path, size_t clusterSize)
            wRc,
            cRc);
 }
-
-#endif
diff --git a/setter/src/os2/links.c b/setter/src/os2/links.c
index 1f1f15b..680c17c 100644
--- a/setter/src/os2/links.c
+++ b/setter/src/os2/links.c
@@ -27,9 +27,6 @@ Contains 32-bit OS/2 code
 Copyright (C) 2011-2021 Natalia Portillo
 *****************************************************************************/
 
-#if(defined(__I386__) || defined(__i386__) || defined(__THW_INTEL) || defined(_M_I386)) &&                             \
-    (defined(__OS2__) || defined(__os2__)) && !defined(__DOS__)
-
 #include "include/defs.h"
 
 void Links(const char* path)
@@ -37,5 +34,3 @@ void Links(const char* path)
     /* Do nothing, not supported by target operating system */
     // TODO: Check if can ask WPS to make Shadow
 }
-
-#endif
diff --git a/setter/src/os2/os2.h b/setter/src/os2/os2.h
index 8dca824..393ab7e 100644
--- a/setter/src/os2/os2.h
+++ b/setter/src/os2/os2.h
@@ -27,7 +27,6 @@ Contains 16-bit OS/2 definitions
 Copyright (C) 2011-2021 Natalia Portillo
 *****************************************************************************/
 
-#if(defined(__OS2__) || defined(__os2__))
 #ifndef AARU_FSTESTER_SETTER_OS2_H
 #define AARU_FSTESTER_SETTER_OS2_H
 
@@ -92,5 +91,3 @@ Copyright (C) 2011-2021 Natalia Portillo
 #endif
 
 #endif
-
-#endif
diff --git a/setter/src/os2/perms.c b/setter/src/os2/perms.c
index fd65bfd..4e41f1e 100644
--- a/setter/src/os2/perms.c
+++ b/setter/src/os2/perms.c
@@ -27,10 +27,7 @@ Contains 16-bit OS/2 code
 Copyright (C) 2011-2021 Natalia Portillo
 *****************************************************************************/
 
-#if((defined(__OS2__) || defined(__os2__)) && !defined(__DOS__)
-
 #include "include/defs.h"
 
 void FilePermissions(const char* path) { /* Do nothing, not supported by target operating system */ }
 
-#endif
diff --git a/setter/src/os2/rsrcfork.c b/setter/src/os2/rsrcfork.c
index 4845e10..3ca4f13 100644
--- a/setter/src/os2/rsrcfork.c
+++ b/setter/src/os2/rsrcfork.c
@@ -27,10 +27,6 @@ Contains 16-bit OS/2 code
 Copyright (C) 2011-2021 Natalia Portillo
 *****************************************************************************/
 
-#if((defined(__OS2__) || defined(__os2__)) && !defined(__DOS__)
-
 #include "include/defs.h"
 
 void ResourceFork(const char* path) { /* Do nothing, not supported by target operating system */ }
-
-#endif
diff --git a/setter/src/os2/sparse.c b/setter/src/os2/sparse.c
index eddb0cc..903e040 100644
--- a/setter/src/os2/sparse.c
+++ b/setter/src/os2/sparse.c
@@ -27,9 +27,6 @@ Contains 16-bit OS/2 code
 Copyright (C) 2011-2021 Natalia Portillo
 *****************************************************************************/
 
-#if(defined(__I86__) || defined(__i86__) || defined(_M_I86)) && (defined(__OS2__) || defined(__os2__)) &&              \
-    !defined(__DOS__)
-
 #define INCL_DOSMISC
 #define INCL_DOSFILEMGR
 
@@ -45,5 +42,3 @@ Copyright (C) 2011-2021 Natalia Portillo
 void Sparse(const char* path)
 { /* Do nothing, not supported by target operating system */
 }
-
-#endif
diff --git a/setter/src/os2/time.c b/setter/src/os2/time.c
index 8c9ec8a..0c7dc4a 100644
--- a/setter/src/os2/time.c
+++ b/setter/src/os2/time.c
@@ -27,9 +27,6 @@ Contains 16-bit OS/2 code
 Copyright (C) 2011-2021 Natalia Portillo
 *****************************************************************************/
 
-#if(defined(__I86__) || defined(__i86__) || defined(_M_I86)) && (defined(__OS2__) || defined(__os2__)) &&              \
-    !defined(__DOS__)
-
 #define INCL_DOSMISC
 #define INCL_DOSFILEMGR
 
@@ -678,5 +675,3 @@ void Timestamps(const char* path)
 
     printf("\tFile name = \"%s\", rc = %d, wRc = %d, cRc = %d, tRc = %d\n", "Y2K_TIME", rc, wRc, cRc, tRc);
 }
-
-#endif
diff --git a/setter/src/os2/volume.c b/setter/src/os2/volume.c
index 118795d..c466d61 100644
--- a/setter/src/os2/volume.c
+++ b/setter/src/os2/volume.c
@@ -27,9 +27,6 @@ Contains 16-bit OS/2 code
 Copyright (C) 2011-2021 Natalia Portillo
 *****************************************************************************/
 
-#if(defined(__I86__) || defined(__i86__) || defined(_M_I86)) && (defined(__OS2__) || defined(__os2__)) &&              \
-    !defined(__DOS__)
-
 #define INCL_DOSMISC
 #define INCL_DOSFILEMGR
 
@@ -138,5 +135,3 @@ void GetVolumeInfo(const char* path, size_t* clusterSize)
 
     free(pfsInfo);
 }
-
-#endif
diff --git a/setter/src/unix/attr.c b/setter/src/unix/attr.c
index 3474847..b333bf0 100644
--- a/setter/src/unix/attr.c
+++ b/setter/src/unix/attr.c
@@ -27,8 +27,6 @@ Contains common implementations for UNIX family and compatibles
 Copyright (C) 2011-2021 Natalia Portillo
 *****************************************************************************/
 
-#if defined(unix) || defined(UNIX) || defined(__unix) || defined(__unix__) || defined(__UNIX__)
-
 #include "../include/defs.h"
 
 #if defined(__linux__) || defined(__LINUX__) || defined(__gnu_linux)
@@ -41,5 +39,3 @@ void FileAttributes(const char* path)
     LinuxFileAttributes(path);
 #endif
 }
-
-#endif
diff --git a/setter/src/unix/deleted.c b/setter/src/unix/deleted.c
index c00fbd6..1cefa46 100644
--- a/setter/src/unix/deleted.c
+++ b/setter/src/unix/deleted.c
@@ -27,8 +27,6 @@ Contains common implementations for UNIX family and compatibles
 Copyright (C) 2011-2021 Natalia Portillo
 *****************************************************************************/
 
-#if defined(unix) || defined(UNIX) || defined(__unix) || defined(__unix__) || defined(__UNIX__)
-
 #include <errno.h>
 #include <stddef.h>
 #include <stdio.h>
@@ -82,5 +80,3 @@ void DeleteFiles(const char* path)
         unlink(filename);
     }
 }
-
-#endif
diff --git a/setter/src/unix/dirdepth.c b/setter/src/unix/dirdepth.c
index e7cf312..fd73a0a 100644
--- a/setter/src/unix/dirdepth.c
+++ b/setter/src/unix/dirdepth.c
@@ -27,8 +27,6 @@ Contains common implementations for UNIX family and compatibles
 Copyright (C) 2011-2021 Natalia Portillo
 *****************************************************************************/
 
-#if defined(unix) || defined(UNIX) || defined(__unix) || defined(__unix__) || defined(__UNIX__)
-
 #include <errno.h>
 #include <stdio.h>
 #include <string.h>
@@ -85,5 +83,3 @@ void DirectoryDepth(const char* path)
 
     printf("\tCreated %ld levels of directory hierarchy\n", pos);
 }
-
-#endif
diff --git a/setter/src/unix/filename.c b/setter/src/unix/filename.c
index 3965414..ceb49d6 100644
--- a/setter/src/unix/filename.c
+++ b/setter/src/unix/filename.c
@@ -27,8 +27,6 @@ Contains common implementations for UNIX family and compatibles
 Copyright (C) 2011-2021 Natalia Portillo
 *****************************************************************************/
 
-#if defined(unix) || defined(UNIX) || defined(__unix) || defined(__unix__) || defined(__UNIX__)
-
 #include <errno.h>
 #include <stdio.h>
 #include <string.h>
@@ -95,5 +93,3 @@ void Filenames(const char* path)
         printf("\tFile name = \"%s\", rc = %d, wRc = %d, cRc = %d\n", filenames[pos], rc, wRc, cRc);
     }
 }
-
-#endif
diff --git a/setter/src/unix/files.c b/setter/src/unix/files.c
index c3dfb02..0f5f72b 100644
--- a/setter/src/unix/files.c
+++ b/setter/src/unix/files.c
@@ -27,8 +27,6 @@ Contains common implementations for UNIX family and compatibles
 Copyright (C) 2011-2021 Natalia Portillo
 *****************************************************************************/
 
-#if defined(unix) || defined(UNIX) || defined(__unix) || defined(__unix__) || defined(__UNIX__)
-
 #include <errno.h>
 #include <stddef.h>
 #include <stdio.h>
@@ -84,5 +82,3 @@ void MillionFiles(const char* path)
 
     printf("\tCreated %ld files\n", pos);
 }
-
-#endif
diff --git a/setter/src/unix/frag.c b/setter/src/unix/frag.c
index 12c0c1a..4b38073 100644
--- a/setter/src/unix/frag.c
+++ b/setter/src/unix/frag.c
@@ -27,8 +27,6 @@ Contains common implementations for UNIX family and compatibles
 Copyright (C) 2011-2021 Natalia Portillo
 *****************************************************************************/
 
-#if defined(unix) || defined(UNIX) || defined(__unix) || defined(__unix__) || defined(__UNIX__)
-
 #include <errno.h>
 #include <stddef.h>
 #include <stdio.h>
@@ -330,5 +328,3 @@ void Fragmentation(const char* path, size_t clusterSize)
            wRc,
            cRc);
 }
-
-#endif
diff --git a/setter/src/unix/links.c b/setter/src/unix/links.c
index d9fa4f6..beca67d 100644
--- a/setter/src/unix/links.c
+++ b/setter/src/unix/links.c
@@ -27,8 +27,6 @@ Contains common implementations for UNIX family and compatibles
 Copyright (C) 2011-2021 Natalia Portillo
 *****************************************************************************/
 
-#if defined(unix) || defined(UNIX) || defined(__unix) || defined(__unix__) || defined(__UNIX__)
-
 #include <errno.h>
 #include <stddef.h>
 #include <stdio.h>
@@ -88,5 +86,3 @@ void Links(const char* path)
 
     if(ret) { printf("Error %d creating symbolic link.\n", errno); }
 }
-
-#endif
diff --git a/setter/src/unix/os.c b/setter/src/unix/os.c
index 872f804..149cf62 100644
--- a/setter/src/unix/os.c
+++ b/setter/src/unix/os.c
@@ -27,8 +27,6 @@ Contains common implementations for UNIX family and compatibles
 Copyright (C) 2011-2021 Natalia Portillo
 *****************************************************************************/
 
-#if defined(unix) || defined(UNIX) || defined(__unix) || defined(__unix__) || defined(__UNIX__)
-
 #include <errno.h>
 #include <stdio.h>
 #include <sys/utsname.h>
@@ -54,5 +52,3 @@ void GetOsInfo()
     printf("\tVersion: %s\n", buf.version);
     printf("\tMachine: %s\n", buf.machine);
 }
-
-#endif
diff --git a/setter/src/unix/perms.c b/setter/src/unix/perms.c
index fbd1f1b..734d16e 100644
--- a/setter/src/unix/perms.c
+++ b/setter/src/unix/perms.c
@@ -27,8 +27,6 @@ Contains common implementations for UNIX family and compatibles
 Copyright (C) 2011-2021 Natalia Portillo
 *****************************************************************************/
 
-#if defined(unix) || defined(UNIX) || defined(__unix) || defined(__unix__) || defined(__UNIX__)
-
 #include <errno.h>
 #include <stdio.h>
 #include <sys/stat.h>
@@ -89,5 +87,3 @@ void FilePermissions(const char* path)
         printf("\t%s: name = \"%s\", rc = %d, cRc = %d\n", unix_perms[i].description, unix_perms[i].filename, rc, cRc);
     }
 }
-
-#endif
diff --git a/setter/src/unix/rsrcfork.c b/setter/src/unix/rsrcfork.c
index b5cfd86..cade7e9 100644
--- a/setter/src/unix/rsrcfork.c
+++ b/setter/src/unix/rsrcfork.c
@@ -27,13 +27,9 @@ Contains common implementations for UNIX family and compatibles
 Copyright (C) 2011-2021 Natalia Portillo
 *****************************************************************************/
 
-#if defined(unix) || defined(UNIX) || defined(__unix) || defined(__unix__) || defined(__UNIX__)
-
 #include "../include/defs.h"
 
 void ResourceFork(const char* path)
 {
     // Not supported
 }
-
-#endif
diff --git a/setter/src/unix/sparse.c b/setter/src/unix/sparse.c
index 60ef39e..dcbce63 100644
--- a/setter/src/unix/sparse.c
+++ b/setter/src/unix/sparse.c
@@ -27,8 +27,6 @@ Contains common implementations for UNIX family and compatibles
 Copyright (C) 2011-2021 Natalia Portillo
 *****************************************************************************/
 
-#if defined(unix) || defined(UNIX) || defined(__unix) || defined(__unix__) || defined(__UNIX__)
-
 #include "../include/defs.h"
 
 #if defined(__linux__) || defined(__LINUX__) || defined(__gnu_linux)
@@ -41,5 +39,3 @@ void Sparse(const char* path)
     LinuxSparse(path);
 #endif
 }
-
-#endif
diff --git a/setter/src/unix/time.c b/setter/src/unix/time.c
index c684a23..20009ea 100644
--- a/setter/src/unix/time.c
+++ b/setter/src/unix/time.c
@@ -27,8 +27,6 @@ Contains common implementations for UNIX family and compatibles
 Copyright (C) 2011-2021 Natalia Portillo
 *****************************************************************************/
 
-#if defined(unix) || defined(UNIX) || defined(__unix) || defined(__unix__) || defined(__UNIX__)
-
 #include <errno.h>
 #include <stddef.h>
 #include <stdio.h>
@@ -316,5 +314,3 @@ void Timestamps(const char* path)
     }
     printf("\tFile name = \"%s\", rc = %d, wRc = %d, cRc = %d, tRc = %d\n", "LESSMTIME", rc, wRc, cRc, tRc);
 }
-
-#endif
diff --git a/setter/src/unix/volume.c b/setter/src/unix/volume.c
index b1630ee..1cf89ff 100644
--- a/setter/src/unix/volume.c
+++ b/setter/src/unix/volume.c
@@ -27,8 +27,6 @@ Contains common implementations for UNIX family and compatibles
 Copyright (C) 2011-2021 Natalia Portillo
 *****************************************************************************/
 
-#if defined(unix) || defined(UNIX) || defined(__unix) || defined(__unix__) || defined(__UNIX__)
-
 #include <errno.h>
 #include <stddef.h>
 #include <stdio.h>
@@ -221,5 +219,3 @@ void GetVolumeInfo(const char* path, size_t* clusterSize)
 
     *clusterSize = buf.f_bsize;
 }
-
-#endif
diff --git a/setter/src/unix/xattr.c b/setter/src/unix/xattr.c
index db96f48..bfb631c 100644
--- a/setter/src/unix/xattr.c
+++ b/setter/src/unix/xattr.c
@@ -27,8 +27,6 @@ Contains common implementations for UNIX family and compatibles
 Copyright (C) 2011-2021 Natalia Portillo
 *****************************************************************************/
 
-#if defined(unix) || defined(UNIX) || defined(__unix) || defined(__unix__) || defined(__UNIX__)
-
 #include "../include/defs.h"
 
 #if defined(__linux__) || defined(__LINUX__) || defined(__gnu_linux)
@@ -41,5 +39,3 @@ void ExtendedAttributes(const char* path)
     LinuxExtendedAttributes(path);
 #endif
 }
-
-#endif
diff --git a/setter/src/win32/attr.c b/setter/src/win32/attr.c
index 60bc83b..f9442fa 100644
--- a/setter/src/win32/attr.c
+++ b/setter/src/win32/attr.c
@@ -29,9 +29,6 @@ Copyright (C) 2011-2021 Natalia Portillo
 
 // ReSharper disable CppJoinDeclarationAndAssignment
 // ReSharper disable CppDeprecatedEntity
-#if defined(__WINDOWS__) || defined(__TOS_WIN__) || defined(__WIN32__) || defined(_WIN64) || defined(_WIN32) ||        \
-    defined(__NT__)
-
 #define _CRT_SECURE_NO_WARNINGS 1
 
 #include <windows.h>
@@ -225,5 +222,3 @@ void FileAttributes(const char* path)
 
     FreeLibrary(advapi32);
 }
-
-#endif
diff --git a/setter/src/win32/deleted.c b/setter/src/win32/deleted.c
index 46cafb0..474add1 100644
--- a/setter/src/win32/deleted.c
+++ b/setter/src/win32/deleted.c
@@ -29,9 +29,6 @@ Copyright (C) 2011-2021 Natalia Portillo
 
 // ReSharper disable CppJoinDeclarationAndAssignment
 // ReSharper disable CppDeprecatedEntity
-#if defined(__WINDOWS__) || defined(__TOS_WIN__) || defined(__WIN32__) || defined(_WIN64) || defined(_WIN32) ||        \
-    defined(__NT__)
-
 #define _CRT_SECURE_NO_WARNINGS 1
 
 #include <windows.h>
@@ -106,5 +103,3 @@ void DeleteFiles(const char* path)
         DeleteFileA(filename);
     }
 }
-
-#endif
diff --git a/setter/src/win32/dirdepth.c b/setter/src/win32/dirdepth.c
index 476ab9e..e497e55 100644
--- a/setter/src/win32/dirdepth.c
+++ b/setter/src/win32/dirdepth.c
@@ -29,9 +29,6 @@ Copyright (C) 2011-2021 Natalia Portillo
 
 // ReSharper disable CppJoinDeclarationAndAssignment
 // ReSharper disable CppDeprecatedEntity
-#if defined(__WINDOWS__) || defined(__TOS_WIN__) || defined(__WIN32__) || defined(_WIN64) || defined(_WIN32) ||        \
-    defined(__NT__)
-
 #define _CRT_SECURE_NO_WARNINGS 1
 
 #include <windows.h>
@@ -107,5 +104,3 @@ void DirectoryDepth(const char* path)
 
     printf("\tCreated %ld levels of directory hierarchy\n", pos);
 }
-
-#endif
diff --git a/setter/src/win32/filename.c b/setter/src/win32/filename.c
index 9054cd0..f1abd84 100644
--- a/setter/src/win32/filename.c
+++ b/setter/src/win32/filename.c
@@ -29,9 +29,6 @@ Copyright (C) 2011-2021 Natalia Portillo
 
 // ReSharper disable CppJoinDeclarationAndAssignment
 // ReSharper disable CppDeprecatedEntity
-#if defined(__WINDOWS__) || defined(__TOS_WIN__) || defined(__WIN32__) || defined(_WIN64) || defined(_WIN32) ||        \
-    defined(__NT__)
-
 #define _CRT_SECURE_NO_WARNINGS 1
 
 #include <windows.h>
@@ -121,5 +118,3 @@ void Filenames(const char* path)
         printf("\tFile name = \"%s\", rc = %lu, wRc = %lu, cRc = %lu\n", filenames[pos], rc, wRc, cRc);
     }
 }
-
-#endif
diff --git a/setter/src/win32/files.c b/setter/src/win32/files.c
index 42273c2..9bad770 100644
--- a/setter/src/win32/files.c
+++ b/setter/src/win32/files.c
@@ -29,9 +29,6 @@ Copyright (C) 2011-2021 Natalia Portillo
 
 // ReSharper disable CppJoinDeclarationAndAssignment
 // ReSharper disable CppDeprecatedEntity
-#if defined(__WINDOWS__) || defined(__TOS_WIN__) || defined(__WIN32__) || defined(_WIN64) || defined(_WIN32) ||        \
-    defined(__NT__)
-
 #define _CRT_SECURE_NO_WARNINGS 1
 
 #include <windows.h>
@@ -108,5 +105,3 @@ void MillionFiles(const char* path)
 
     printf("\tCreated %lu files\n", pos);
 }
-
-#endif
diff --git a/setter/src/win32/frag.c b/setter/src/win32/frag.c
index 4e2e20f..05f80d6 100644
--- a/setter/src/win32/frag.c
+++ b/setter/src/win32/frag.c
@@ -29,9 +29,6 @@ Copyright (C) 2011-2021 Natalia Portillo
 
 // ReSharper disable CppJoinDeclarationAndAssignment
 // ReSharper disable CppDeprecatedEntity
-#if defined(__WINDOWS__) || defined(__TOS_WIN__) || defined(__WIN32__) || defined(_WIN64) || defined(_WIN32) ||        \
-    defined(__NT__)
-
 #define _CRT_SECURE_NO_WARNINGS 1
 
 #include <windows.h>
@@ -363,5 +360,3 @@ void Fragmentation(const char* path, size_t clusterSize)
            wRc,
            cRc);
 }
-
-#endif
diff --git a/setter/src/win32/links.c b/setter/src/win32/links.c
index e765d27..86e6369 100644
--- a/setter/src/win32/links.c
+++ b/setter/src/win32/links.c
@@ -29,9 +29,6 @@ Copyright (C) 2011-2021 Natalia Portillo
 
 // ReSharper disable CppJoinDeclarationAndAssignment
 // ReSharper disable CppDeprecatedEntity
-#if defined(__WINDOWS__) || defined(__TOS_WIN__) || defined(__WIN32__) || defined(_WIN64) || defined(_WIN32) ||        \
-    defined(__NT__)
-
 #define _CRT_SECURE_NO_WARNINGS 1
 
 #include <windows.h>
@@ -216,5 +213,3 @@ void Links(const char* path)
 
     FreeLibrary(kernel32);
 }
-
-#endif
diff --git a/setter/src/win32/os.c b/setter/src/win32/os.c
index e4dcf36..0c2030a 100644
--- a/setter/src/win32/os.c
+++ b/setter/src/win32/os.c
@@ -29,9 +29,6 @@ Copyright (C) 2011-2021 Natalia Portillo
 
 // ReSharper disable CppJoinDeclarationAndAssignment
 // ReSharper disable CppDeprecatedEntity
-#if defined(__WINDOWS__) || defined(__TOS_WIN__) || defined(__WIN32__) || defined(_WIN64) || defined(_WIN32) ||        \
-    defined(__NT__)
-
 #define _CRT_SECURE_NO_WARNINGS 1
 
 #include <windows.h>
@@ -200,5 +197,3 @@ void GetOsInfo()
 
     FreeLibrary(kernel32);
 }
-
-#endif
diff --git a/setter/src/win32/perms.c b/setter/src/win32/perms.c
index b45d16b..700df09 100644
--- a/setter/src/win32/perms.c
+++ b/setter/src/win32/perms.c
@@ -29,9 +29,6 @@ Copyright (C) 2011-2021 Natalia Portillo
 
 // ReSharper disable CppJoinDeclarationAndAssignment
 // ReSharper disable CppDeprecatedEntity
-#if defined(__WINDOWS__) || defined(__TOS_WIN__) || defined(__WIN32__) || defined(_WIN64) || defined(_WIN32) ||        \
-    defined(__NT__)
-
 #define _CRT_SECURE_NO_WARNINGS 1
 
 #include "../include/defs.h"
@@ -39,5 +36,3 @@ Copyright (C) 2011-2021 Natalia Portillo
 void FilePermissions(const char* path)
 { /* Do nothing, not supported by target operating system */
 }
-
-#endif
diff --git a/setter/src/win32/rsrcfork.c b/setter/src/win32/rsrcfork.c
index 0d4990a..cd25c0b 100644
--- a/setter/src/win32/rsrcfork.c
+++ b/setter/src/win32/rsrcfork.c
@@ -29,9 +29,6 @@ Copyright (C) 2011-2021 Natalia Portillo
 
 // ReSharper disable CppJoinDeclarationAndAssignment
 // ReSharper disable CppDeprecatedEntity
-#if defined(__WINDOWS__) || defined(__TOS_WIN__) || defined(__WIN32__) || defined(_WIN64) || defined(_WIN32) ||        \
-    defined(__NT__)
-
 #define _CRT_SECURE_NO_WARNINGS 1
 
 #include <windows.h>
@@ -346,5 +343,3 @@ void ResourceFork(const char* path)
            wRc,
            cRc);
 }
-
-#endif
diff --git a/setter/src/win32/sparse.c b/setter/src/win32/sparse.c
index 4a5d77f..b526db1 100644
--- a/setter/src/win32/sparse.c
+++ b/setter/src/win32/sparse.c
@@ -29,9 +29,6 @@ Copyright (C) 2011-2021 Natalia Portillo
 
 // ReSharper disable CppJoinDeclarationAndAssignment
 // ReSharper disable CppDeprecatedEntity
-#if defined(__WINDOWS__) || defined(__TOS_WIN__) || defined(__WIN32__) || defined(_WIN64) || defined(_WIN32) ||        \
-    defined(__NT__)
-
 #define _CRT_SECURE_NO_WARNINGS 1
 
 #include <windows.h>
@@ -305,5 +302,3 @@ void Sparse(const char* path)
            sRc,
            zRc);
 }
-
-#endif
diff --git a/setter/src/win32/time.c b/setter/src/win32/time.c
index 8bf8db6..e371bf2 100644
--- a/setter/src/win32/time.c
+++ b/setter/src/win32/time.c
@@ -29,9 +29,6 @@ Copyright (C) 2011-2021 Natalia Portillo
 
 // ReSharper disable CppJoinDeclarationAndAssignment
 // ReSharper disable CppDeprecatedEntity
-#if defined(__WINDOWS__) || defined(__TOS_WIN__) || defined(__WIN32__) || defined(_WIN64) || defined(_WIN32) ||        \
-    defined(__NT__)
-
 #define _CRT_SECURE_NO_WARNINGS 1
 
 #include <windows.h>
@@ -141,5 +138,3 @@ void Timestamps(const char* path)
                tRc);
     }
 }
-
-#endif
diff --git a/setter/src/win32/volume.c b/setter/src/win32/volume.c
index 7307010..5986052 100644
--- a/setter/src/win32/volume.c
+++ b/setter/src/win32/volume.c
@@ -29,9 +29,6 @@ Copyright (C) 2011-2021 Natalia Portillo
 
 // ReSharper disable CppJoinDeclarationAndAssignment
 // ReSharper disable CppDeprecatedEntity
-#if defined(__WINDOWS__) || defined(__TOS_WIN__) || defined(__WIN32__) || defined(_WIN64) || defined(_WIN32) ||        \
-    defined(__NT__)
-
 #define _CRT_SECURE_NO_WARNINGS 1
 
 #include <windows.h>
@@ -351,5 +348,3 @@ void GetVolumeInfo(const char* path, size_t* clusterSize)
 
     if(func) FreeLibrary(kernel32);
 }
-
-#endif
diff --git a/setter/src/win32/win32.h b/setter/src/win32/win32.h
index 552bb38..bb3fd6a 100644
--- a/setter/src/win32/win32.h
+++ b/setter/src/win32/win32.h
@@ -27,9 +27,6 @@ Contains 32-bit and 64-bit Windows declarations
 Copyright (C) 2011-2021 Natalia Portillo
 *****************************************************************************/
 
-#if defined(__WINDOWS__) || defined(__TOS_WIN__) || defined(__WIN32__) || defined(_WIN64) || defined(_WIN32) ||        \
-    defined(__NT__)
-
 #ifndef AARU_FSTESTER_SETTER_WIN32_H
 #define AARU_FSTESTER_SETTER_WIN32_H
 
@@ -61,5 +58,3 @@ static DWORD dwMaxNameSize     = MAX_PATH + 1;
 static DWORD dwFilePermissions = GENERIC_READ | GENERIC_WRITE;
 
 #endif
-
-#endif
diff --git a/setter/src/win32/xattr.c b/setter/src/win32/xattr.c
index 2cb54ba..4100c29 100644
--- a/setter/src/win32/xattr.c
+++ b/setter/src/win32/xattr.c
@@ -29,9 +29,6 @@ Copyright (C) 2011-2021 Natalia Portillo
 
 // ReSharper disable CppJoinDeclarationAndAssignment
 // ReSharper disable CppDeprecatedEntity
-#if defined(__WINDOWS__) || defined(__TOS_WIN__) || defined(__WIN32__) || defined(_WIN64) || defined(_WIN32) ||        \
-    defined(__NT__)
-
 #define _CRT_SECURE_NO_WARNINGS 1
 
 #include <windows.h>
@@ -354,5 +351,3 @@ void ExtendedAttributes(const char* path)
 
     FreeLibrary(ntdll);
 }
-
-#endif