From b1953585fe7a3ae047bea505bb2a716fb660f110 Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@users.noreply.github.com>
Date: Tue, 20 Aug 2019 22:47:30 +0200
Subject: [PATCH] - remove doomtypes.h include from files.h.

---
 src/gamedata/resourcefiles/file_directory.cpp | 1 +
 src/gamedata/resourcefiles/file_grp.cpp       | 1 +
 src/gamedata/resourcefiles/file_lump.cpp      | 1 +
 src/gamedata/resourcefiles/file_pak.cpp       | 1 +
 src/gamedata/resourcefiles/file_rff.cpp       | 1 +
 src/gamedata/resourcefiles/resourcefile.cpp   | 1 +
 src/gamedata/textures/formats/md5check.cpp    | 1 +
 src/gamedata/w_wad.h                          | 1 +
 src/utility/files.h                           | 4 +++-
 src/utility/files_decompress.cpp              | 2 +-
 10 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/gamedata/resourcefiles/file_directory.cpp b/src/gamedata/resourcefiles/file_directory.cpp
index 54cb1e7a6..22b3456fb 100644
--- a/src/gamedata/resourcefiles/file_directory.cpp
+++ b/src/gamedata/resourcefiles/file_directory.cpp
@@ -43,6 +43,7 @@
 
 #include "resourcefile.h"
 #include "cmdlib.h"
+#include "doomtype.h"
 
 
 
diff --git a/src/gamedata/resourcefiles/file_grp.cpp b/src/gamedata/resourcefiles/file_grp.cpp
index ba0493dd6..936490177 100644
--- a/src/gamedata/resourcefiles/file_grp.cpp
+++ b/src/gamedata/resourcefiles/file_grp.cpp
@@ -35,6 +35,7 @@
 
 #include "resourcefile.h"
 #include "w_wad.h"
+#include "doomtype.h"
 
 //==========================================================================
 //
diff --git a/src/gamedata/resourcefiles/file_lump.cpp b/src/gamedata/resourcefiles/file_lump.cpp
index 5e47183ea..bd0cc1f1b 100644
--- a/src/gamedata/resourcefiles/file_lump.cpp
+++ b/src/gamedata/resourcefiles/file_lump.cpp
@@ -35,6 +35,7 @@
 #include "resourcefile.h"
 #include "cmdlib.h"
 #include "w_wad.h"
+#include "doomtype.h"
 
 //==========================================================================
 //
diff --git a/src/gamedata/resourcefiles/file_pak.cpp b/src/gamedata/resourcefiles/file_pak.cpp
index f679a0564..d69c5673d 100644
--- a/src/gamedata/resourcefiles/file_pak.cpp
+++ b/src/gamedata/resourcefiles/file_pak.cpp
@@ -34,6 +34,7 @@
 
 #include "resourcefile.h"
 #include "w_wad.h"
+#include "doomtype.h"
 
 //==========================================================================
 //
diff --git a/src/gamedata/resourcefiles/file_rff.cpp b/src/gamedata/resourcefiles/file_rff.cpp
index 89ef440f3..056379c7b 100644
--- a/src/gamedata/resourcefiles/file_rff.cpp
+++ b/src/gamedata/resourcefiles/file_rff.cpp
@@ -36,6 +36,7 @@
 #include "resourcefile.h"
 #include "templates.h"
 #include "w_wad.h"
+#include "doomtype.h"
 
 //==========================================================================
 //
diff --git a/src/gamedata/resourcefiles/resourcefile.cpp b/src/gamedata/resourcefiles/resourcefile.cpp
index 92232e701..f19ea7a2b 100644
--- a/src/gamedata/resourcefiles/resourcefile.cpp
+++ b/src/gamedata/resourcefiles/resourcefile.cpp
@@ -40,6 +40,7 @@
 #include "w_wad.h"
 #include "gi.h"
 #include "doomstat.h"
+#include "doomtype.h"
 
 
 //==========================================================================
diff --git a/src/gamedata/textures/formats/md5check.cpp b/src/gamedata/textures/formats/md5check.cpp
index 411f81e4b..eb0a188d0 100644
--- a/src/gamedata/textures/formats/md5check.cpp
+++ b/src/gamedata/textures/formats/md5check.cpp
@@ -37,6 +37,7 @@
 #include <stdint.h>
 #include "files.h"
 #include "md5.h"
+#include "doomtype.h"
 
 struct MD5Check
 {
diff --git a/src/gamedata/w_wad.h b/src/gamedata/w_wad.h
index a51ac80c8..be45a8f1d 100644
--- a/src/gamedata/w_wad.h
+++ b/src/gamedata/w_wad.h
@@ -12,6 +12,7 @@
 #include "files.h"
 #include "doomdef.h"
 #include "tarray.h"
+#include "zstring.h"
 
 class FResourceFile;
 struct FResourceLump;
diff --git a/src/utility/files.h b/src/utility/files.h
index 3ab278466..f3d768e37 100644
--- a/src/utility/files.h
+++ b/src/utility/files.h
@@ -37,9 +37,11 @@
 #define FILES_H
 
 #include <stdio.h>
+#include <stdint.h>
 #include <functional>
-#include "doomtype.h"
+#include "basictypes.h"
 #include "m_swap.h"
+#include "tarray.h"
 
 // Zip compression methods, extended by some internal types to be passed to OpenDecompressor
 enum
diff --git a/src/utility/files_decompress.cpp b/src/utility/files_decompress.cpp
index 03f0c107c..6a5596a0a 100644
--- a/src/utility/files_decompress.cpp
+++ b/src/utility/files_decompress.cpp
@@ -59,7 +59,7 @@ void DecompressorBase::DecompressionError(const char *error, ...) const
 	char errortext[MAX_ERRORTEXT];
 
 	va_start(argptr, error);
-	myvsnprintf(errortext, MAX_ERRORTEXT, error, argptr);
+	vsnprintf(errortext, MAX_ERRORTEXT, error, argptr);
 	va_end(argptr);
 
 	if (ErrorCallback != nullptr) ErrorCallback(errortext);