From 4a6704367be5f9146ca80a3cf363e0c9a09bb561 Mon Sep 17 00:00:00 2001
From: Patryk Obara <dreamer.tan@gmail.com>
Date: Wed, 5 Feb 2020 19:15:13 +0100
Subject: [PATCH] Reorder includes for drive_cache

Class DOS_Drive_Cache is declared in dos_system.h, but this header was
indirectly included.  Remove faulty windows.h include (the correct one
exists in cross.h already).
---
 include/dos_system.h    | 16 +++++-----------
 src/dos/drive_cache.cpp | 22 ++++++++--------------
 2 files changed, 13 insertions(+), 25 deletions(-)

diff --git a/include/dos_system.h b/include/dos_system.h
index 4f5fd72c..1563a000 100644
--- a/include/dos_system.h
+++ b/include/dos_system.h
@@ -16,23 +16,16 @@
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
-
 #ifndef DOSBOX_DOS_SYSTEM_H
 #define DOSBOX_DOS_SYSTEM_H
 
-#include <vector>
-#ifndef DOSBOX_DOSBOX_H
 #include "dosbox.h"
-#endif
-#ifndef DOSBOX_CROSS_H
+
+#include <vector>
+
 #include "cross.h"
-#endif
-#ifndef DOSBOX_SUPPORT_H
-#include "support.h"
-#endif
-#ifndef DOSBOX_MEM_H
 #include "mem.h"
-#endif
+#include "support.h"
 
 #define DOS_NAMELENGTH 12
 #define DOS_NAMELENGTH_ASCII (DOS_NAMELENGTH+1)
@@ -301,4 +294,5 @@ void DOS_AddDevice(DOS_Device * adddev);
 void DOS_DelDevice(DOS_Device * dev);
 
 void VFILE_Register(const char * name,Bit8u * data,Bit32u size);
+
 #endif
diff --git a/src/dos/drive_cache.cpp b/src/dos/drive_cache.cpp
index 6a1fb67c..091ec384 100644
--- a/src/dos/drive_cache.cpp
+++ b/src/dos/drive_cache.cpp
@@ -16,23 +16,17 @@
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
+#include "dos_system.h"
 
-#include "drives.h"
-#include "dos_inc.h"
-#include "support.h"
-#include "cross.h"
-
-// System includes
-#include <assert.h>
-#include <vector>
-#include <iterator>
 #include <algorithm>
+#include <cassert>
+#include <iterator>
+#include <vector>
 
-#if defined (WIN32)   /* Win 32 */
-#define WIN32_LEAN_AND_MEAN        // Exclude rarely-used stuff from 
-#include <windows.h>
-#endif
-
+#include "cross.h"
+#include "dos_inc.h"
+#include "drives.h"
+#include "support.h"
 
 int fileInfoCounter = 0;