Localize includes

include/bitmapinfoheader.h

@@ -2,6 +2,8 @@
 #ifndef __ISP_UTILS_V4_BITMAPINFOHEADER
 #define __ISP_UTILS_V4_BITMAPINFOHEADER
 
+#include "guid.h"
+
 /* [doc] windows_BITMAPFILEHEADER
  *
  * Packed portable representation of the Microsoft Windows BITMAPFILEHEADER

src/aviwriter/avi.h

@@ -19,10 +19,7 @@
 #ifndef __VIDEOMGR_UTIL_AVI_H
 #define __VIDEOMGR_UTIL_AVI_H
 
-#include "wave_mmreg.h"
 #include "waveformatex.h"
-#include "bitmapinfoheader.h"
-#include "riff.h"
 
 #if defined(_MSC_VER)
 # pragma pack(push,1)

src/aviwriter/avi_writer.cpp

@@ -19,6 +19,7 @@
 /* Shut up! */
 #define _CRT_NONSTDC_NO_DEPRECATE
 
+#include "bitmapinfoheader.h"
 #include "rawint.h"
 #include "avi_writer.h"
 #include "avi_rw_iobuf.h"

src/aviwriter/avi_writer.h

@@ -20,6 +20,7 @@
 #define __ISP_UTILS_AVI_WRITER_H
 
 #include "avi.h"
+#include "riff.h"
 
 enum {
 	AVI_WRITER_STATE_INIT=0,

src/hardware/hardware.cpp

@@ -21,6 +21,8 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <limits.h>
+
+#include "bitmapinfoheader.h"
 #include "dosbox.h"
 #include "control.h"
 #include "hardware.h"
@@ -33,6 +35,7 @@
 #include "mixer.h"
 #include "render.h"
 #include "cross.h"
+#include "wave_mmreg.h"
 
 #if (C_SSHOT)
 #include <zlib.h>