From 351be36e85c4db160c37c6997aa29addaea14fed Mon Sep 17 00:00:00 2001
From: Natalia Portillo <claunia@claunia.com>
Date: Thu, 11 Mar 2021 02:56:39 +0000
Subject: [PATCH] Clean includes for DOS.

---
 setter/src/dos/attr.c     |  6 ------
 setter/src/dos/deleted.c  | 10 ----------
 setter/src/dos/dirdepth.c |  1 -
 setter/src/dos/filename.c |  5 -----
 setter/src/dos/files.c    |  6 ------
 setter/src/dos/frag.c     |  4 +---
 setter/src/dos/links.c    | 11 -----------
 setter/src/dos/os.c       |  9 +--------
 setter/src/dos/perms.c    | 18 ------------------
 setter/src/dos/rsrcfork.c | 18 ------------------
 setter/src/dos/sparse.c   | 18 ------------------
 setter/src/dos/time.c     |  7 +------
 setter/src/dos/volume.c   |  5 +----
 setter/src/dos/xattr.c    | 18 ------------------
 14 files changed, 4 insertions(+), 132 deletions(-)

diff --git a/setter/src/dos/attr.c b/setter/src/dos/attr.c
index d4c553c..4a0c00d 100644
--- a/setter/src/dos/attr.c
+++ b/setter/src/dos/attr.c
@@ -29,13 +29,8 @@ Copyright (C) 2011-2021 Natalia Portillo
 
 #if defined(__DOS__) || defined(MSDOS)
 
-#include <direct.h>
 #include <dos.h>
-#include <i86.h>
-#include <io.h>
-#include <malloc.h>
 #include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
 
 #if defined(__WATCOM__)
@@ -44,7 +39,6 @@ Copyright (C) 2011-2021 Natalia Portillo
 #include <unistd.h>
 #endif
 
-#include "../include/consts.h"
 #include "../include/defs.h"
 #include "../include/dosos2.h"
 #include "dos.h"
diff --git a/setter/src/dos/deleted.c b/setter/src/dos/deleted.c
index 32b2e5c..627fd8d 100644
--- a/setter/src/dos/deleted.c
+++ b/setter/src/dos/deleted.c
@@ -29,13 +29,8 @@ Copyright (C) 2011-2021 Natalia Portillo
 
 #if defined(__DOS__) || defined(MSDOS)
 
-#include <direct.h>
 #include <dos.h>
-#include <i86.h>
-#include <io.h>
-#include <malloc.h>
 #include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
 
 #if defined(__WATCOM__)
@@ -44,11 +39,6 @@ Copyright (C) 2011-2021 Natalia Portillo
 #include <unistd.h>
 #endif
 
-#include "../include/consts.h"
-#include "../include/defs.h"
-#include "../include/dosos2.h"
-#include "dos.h"
-
 #include "../include/defs.h"
 #include "../include/dosos2.h"
 #include "dos.h"
diff --git a/setter/src/dos/dirdepth.c b/setter/src/dos/dirdepth.c
index 1282af5..bce8260 100644
--- a/setter/src/dos/dirdepth.c
+++ b/setter/src/dos/dirdepth.c
@@ -31,7 +31,6 @@ Copyright (C) 2011-2021 Natalia Portillo
 
 #include <direct.h>
 #include <dos.h>
-#include <i86.h>
 #include <io.h>
 #include <malloc.h>
 #include <stdio.h>
diff --git a/setter/src/dos/filename.c b/setter/src/dos/filename.c
index 5f9867c..1fb008f 100644
--- a/setter/src/dos/filename.c
+++ b/setter/src/dos/filename.c
@@ -29,13 +29,8 @@ Copyright (C) 2011-2021 Natalia Portillo
 
 #if defined(__DOS__) || defined(MSDOS)
 
-#include <direct.h>
 #include <dos.h>
-#include <i86.h>
-#include <io.h>
-#include <malloc.h>
 #include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
 
 #if defined(__WATCOM__)
diff --git a/setter/src/dos/files.c b/setter/src/dos/files.c
index 9e18a7d..5a2d421 100644
--- a/setter/src/dos/files.c
+++ b/setter/src/dos/files.c
@@ -29,13 +29,8 @@ Copyright (C) 2011-2021 Natalia Portillo
 
 #if defined(__DOS__) || defined(MSDOS)
 
-#include <direct.h>
 #include <dos.h>
-#include <i86.h>
-#include <io.h>
-#include <malloc.h>
 #include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
 
 #if defined(__WATCOM__)
@@ -44,7 +39,6 @@ Copyright (C) 2011-2021 Natalia Portillo
 #include <unistd.h>
 #endif
 
-#include "../include/consts.h"
 #include "../include/defs.h"
 #include "../include/dosos2.h"
 #include "dos.h"
diff --git a/setter/src/dos/frag.c b/setter/src/dos/frag.c
index 28e4a32..a90572c 100644
--- a/setter/src/dos/frag.c
+++ b/setter/src/dos/frag.c
@@ -29,16 +29,14 @@ Copyright (C) 2011-2021 Natalia Portillo
 
 #if defined(__DOS__) || defined(MSDOS)
 
-#include <direct.h>
 #include <dos.h>
 #include <io.h>
-#include <malloc.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
 #ifdef __WATCOMC__
-#include <i86.h>
+#include <direct.h>
 #elif defined(__DJGPP__)
 #include <unistd.h>
 #endif
diff --git a/setter/src/dos/links.c b/setter/src/dos/links.c
index 4e676ee..cc33ef8 100644
--- a/setter/src/dos/links.c
+++ b/setter/src/dos/links.c
@@ -29,18 +29,7 @@ Copyright (C) 2011-2021 Natalia Portillo
 
 #if defined(__DOS__) || defined(MSDOS)
 
-#include <direct.h>
-#include <dos.h>
-#include <io.h>
-#include <malloc.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "../include/consts.h"
 #include "../include/defs.h"
-#include "../include/dosos2.h"
-#include "dos.h"
 
 void Links(const char* path)
 { /* Do nothing, not supported by target operating system */
diff --git a/setter/src/dos/os.c b/setter/src/dos/os.c
index d3473e5..a1a6356 100644
--- a/setter/src/dos/os.c
+++ b/setter/src/dos/os.c
@@ -29,22 +29,15 @@ Copyright (C) 2011-2021 Natalia Portillo
 
 #if defined(__DOS__) || defined(MSDOS)
 
-#include <direct.h>
 #include <dos.h>
-#include <i86.h>
-#include <io.h>
-#include <malloc.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
 #if defined(__WATCOM__)
-#include <direct.h>
-#elif defined(__DJGPP__)
-#include <unistd.h>
+#include <i86.h>
 #endif
 
-#include "../include/consts.h"
 #include "../include/defs.h"
 #include "../include/dosos2.h"
 #include "dos.h"
diff --git a/setter/src/dos/perms.c b/setter/src/dos/perms.c
index 966618e..3550edd 100644
--- a/setter/src/dos/perms.c
+++ b/setter/src/dos/perms.c
@@ -29,25 +29,7 @@ Copyright (C) 2011-2021 Natalia Portillo
 
 #if defined(__DOS__) || defined(MSDOS)
 
-#include <direct.h>
-#include <dos.h>
-#include <i86.h>
-#include <io.h>
-#include <malloc.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#if defined(__WATCOM__)
-#include <direct.h>
-#elif defined(__DJGPP__)
-#include <unistd.h>
-#endif
-
-#include "../include/consts.h"
 #include "../include/defs.h"
-#include "../include/dosos2.h"
-#include "dos.h"
 
 void FilePermissions(const char* path)
 { /* Do nothing, not supported by target operating system */
diff --git a/setter/src/dos/rsrcfork.c b/setter/src/dos/rsrcfork.c
index faadfb6..f3a0057 100644
--- a/setter/src/dos/rsrcfork.c
+++ b/setter/src/dos/rsrcfork.c
@@ -29,25 +29,7 @@ Copyright (C) 2011-2021 Natalia Portillo
 
 #if defined(__DOS__) || defined(MSDOS)
 
-#include <direct.h>
-#include <dos.h>
-#include <i86.h>
-#include <io.h>
-#include <malloc.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#if defined(__WATCOM__)
-#include <direct.h>
-#elif defined(__DJGPP__)
-#include <unistd.h>
-#endif
-
-#include "../include/consts.h"
 #include "../include/defs.h"
-#include "../include/dosos2.h"
-#include "dos.h"
 
 void ResourceFork(const char* path)
 { /* Do nothing, not supported by target operating system */
diff --git a/setter/src/dos/sparse.c b/setter/src/dos/sparse.c
index 7dca134..8d4205e 100644
--- a/setter/src/dos/sparse.c
+++ b/setter/src/dos/sparse.c
@@ -29,25 +29,7 @@ Copyright (C) 2011-2021 Natalia Portillo
 
 #if defined(__DOS__) || defined(MSDOS)
 
-#include <direct.h>
-#include <dos.h>
-#include <i86.h>
-#include <io.h>
-#include <malloc.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#if defined(__WATCOM__)
-#include <direct.h>
-#elif defined(__DJGPP__)
-#include <unistd.h>
-#endif
-
-#include "../include/consts.h"
 #include "../include/defs.h"
-#include "../include/dosos2.h"
-#include "dos.h"
 
 void Sparse(const char* path)
 { /* Do nothing, not supported by target operating system */
diff --git a/setter/src/dos/time.c b/setter/src/dos/time.c
index c8db30c..b0890f3 100644
--- a/setter/src/dos/time.c
+++ b/setter/src/dos/time.c
@@ -29,22 +29,17 @@ Copyright (C) 2011-2021 Natalia Portillo
 
 #if defined(__DOS__) || defined(MSDOS)
 
-#include <direct.h>
 #include <dos.h>
-#include <i86.h>
-#include <io.h>
-#include <malloc.h>
 #include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
 
 #if defined(__WATCOM__)
 #include <direct.h>
+#include <i86.h>
 #elif defined(__DJGPP__)
 #include <unistd.h>
 #endif
 
-#include "../include/consts.h"
 #include "../include/defs.h"
 #include "../include/dosos2.h"
 #include "dos.h"
diff --git a/setter/src/dos/volume.c b/setter/src/dos/volume.c
index fcd66a0..221dcd5 100644
--- a/setter/src/dos/volume.c
+++ b/setter/src/dos/volume.c
@@ -31,7 +31,6 @@ Copyright (C) 2011-2021 Natalia Portillo
 
 #include <direct.h>
 #include <dos.h>
-#include <i86.h>
 #include <io.h>
 #include <malloc.h>
 #include <stdio.h>
@@ -39,9 +38,7 @@ Copyright (C) 2011-2021 Natalia Portillo
 #include <string.h>
 
 #if defined(__WATCOM__)
-#include <direct.h>
-#elif defined(__DJGPP__)
-#include <unistd.h>
+#include <i86.h>
 #endif
 
 #include "../include/consts.h"
diff --git a/setter/src/dos/xattr.c b/setter/src/dos/xattr.c
index 0947e9f..79c13e6 100644
--- a/setter/src/dos/xattr.c
+++ b/setter/src/dos/xattr.c
@@ -29,25 +29,7 @@ Copyright (C) 2011-2021 Natalia Portillo
 
 #if defined(__DOS__) || defined(MSDOS)
 
-#include <direct.h>
-#include <dos.h>
-#include <i86.h>
-#include <io.h>
-#include <malloc.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#if defined(__WATCOM__)
-#include <direct.h>
-#elif defined(__DJGPP__)
-#include <unistd.h>
-#endif
-
-#include "../include/consts.h"
 #include "../include/defs.h"
-#include "../include/dosos2.h"
-#include "dos.h"
 
 void ExtendedAttributes(const char* path)
 { /* Do nothing, not supported by target operating system */