9 files changed, 22 insertions, 46 deletions
diff --git a/src/adlmidi.cpp b/src/adlmidi.cpp
index 7f75b6e..cddfca2 100644
--- a/src/adlmidi.cpp
+++ b/src/adlmidi.cpp
@@ -22,7 +22,14 @@
  */
 
 #include "adlmidi_midiplay.hpp"
+#include "adlmidi_opl3.hpp"
 #include "adlmidi_private.hpp"
+#ifndef ADLMIDI_HW_OPL
+#include "chips/opl_chip_base.h"
+#endif
+#ifndef ADLMIDI_DISABLE_MIDI_SEQUENCER
+#include "midi_sequencer.hpp"
+#endif
 
 /* Unify MIDI player casting and interface between ADLMIDI and OPNMIDI */
 #define GET_MIDI_PLAYER(device) reinterpret_cast<MIDIplay *>((device)->adl_midiPlayer)
diff --git a/src/adlmidi_load.cpp b/src/adlmidi_load.cpp
index ff036d4..534256c 100644
--- a/src/adlmidi_load.cpp
+++ b/src/adlmidi_load.cpp
@@ -22,8 +22,11 @@
  */
 
 #include "adlmidi_midiplay.hpp"
+#include "adlmidi_opl3.hpp"
 #include "adlmidi_private.hpp"
 #include "adlmidi_cvt.hpp"
+#include "file_reader.hpp"
+#include "midi_sequencer.hpp"
 #include "wopl/wopl_file.h"
 
 bool MIDIplay::LoadBank(const std::string &filename)
diff --git a/src/adlmidi_midiplay.cpp b/src/adlmidi_midiplay.cpp
index 5f1fd87..708ee69 100644
--- a/src/adlmidi_midiplay.cpp
+++ b/src/adlmidi_midiplay.cpp
@@ -22,6 +22,7 @@
  */
 
 #include "adlmidi_midiplay.hpp"
+#include "adlmidi_opl3.hpp"
 #include "adlmidi_private.hpp"
 #include "midi_sequencer.hpp"
 
diff --git a/src/adlmidi_midiplay.hpp b/src/adlmidi_midiplay.hpp
index e85bacf..5df639b 100644
--- a/src/adlmidi_midiplay.hpp
+++ b/src/adlmidi_midiplay.hpp
@@ -27,19 +27,6 @@
 #include "adldata.hh"
 #include "adlmidi_private.hpp"
 #include "adlmidi_ptr.hpp"
-#include "adlmidi.h"
-#include "midi_sequencer.h"
-#include <vector>
-#include <map>
-#include <set>
-#include <cstring>
-#include <cassert>
-#include <math.h>
-#include <stdint.h>
-
-class OPL3;
-class BW_MidiSequencer;
-class FileAndMemReader;
 
 /**
  * @brief Hooks of the internal events
diff --git a/src/adlmidi_opl3.hpp b/src/adlmidi_opl3.hpp
index 7282de4..c5b7fcd 100644
--- a/src/adlmidi_opl3.hpp
+++ b/src/adlmidi_opl3.hpp
@@ -26,13 +26,8 @@
 
 #include "adldata.hh"
 #include "adlmidi_ptr.hpp"
+#include "adlmidi_private.hpp"
 #include "adlmidi_bankmap.h"
-#include "adlmidi.h"
-#include <vector>
-#include <stdint.h>
-
-class MIDIplay;
-class OPLChipBase;
 
 /**
  * @brief OPL3 Chip management class
diff --git a/src/adlmidi_private.cpp b/src/adlmidi_private.cpp
index 00507ff..8c9e769 100644
--- a/src/adlmidi_private.cpp
+++ b/src/adlmidi_private.cpp
@@ -22,6 +22,7 @@
  */
 
 #include "adlmidi_midiplay.hpp"
+#include "adlmidi_opl3.hpp"
 #include "adlmidi_private.hpp"
 
 std::string ADLMIDI_ErrorString;
diff --git a/src/adlmidi_private.hpp b/src/adlmidi_private.hpp
index 8e95ea5..d16c8f6 100644
--- a/src/adlmidi_private.hpp
+++ b/src/adlmidi_private.hpp
@@ -49,7 +49,6 @@ typedef __int64 ssize_t;
 #       else
 typedef __int32 ssize_t;
 #       endif
-#       define NOMINMAX 1 //Don't override std::min and std::max
 #   else
 #       ifdef _WIN64
 typedef int64_t ssize_t;
@@ -130,18 +129,18 @@ typedef int32_t ssize_t;
 #define INT32_MAX   0x7fffffff
 #endif
 
-#include "file_reader.hpp"
+class FileAndMemReader;
 
 #ifndef ADLMIDI_DISABLE_MIDI_SEQUENCER
 // Rename class to avoid ABI collisions
 #define BW_MidiSequencer AdlMidiSequencer
-#include "midi_sequencer.hpp"
+class BW_MidiSequencer;
 typedef BW_MidiSequencer MidiSequencer;
+typedef struct BW_MidiRtInterface BW_MidiRtInterface;
 #endif//ADLMIDI_DISABLE_MIDI_SEQUENCER
 
-#ifndef ADLMIDI_HW_OPL
-#include "chips/opl_chip_base.h"
-#endif
+class OPL3;
+class OPLChipBase;
 
 #include "adldata.hh"
 
@@ -153,7 +152,8 @@ typedef BW_MidiSequencer MidiSequencer;
 #endif
 
 #include "adlmidi_ptr.hpp"
-#include "adlmidi_opl3.hpp"
+
+class MIDIplay;
 
 #define ADL_UNUSED(x) (void)x
 
@@ -215,25 +215,6 @@ inline int32_t adl_cvtU32(int32_t x)
 }
 
 
-// I think, this is useless inside of Library
-/*
-struct FourChars
-{
-    char ret[4];
-
-    FourChars(const char *s)
-    {
-        for(unsigned c = 0; c < 4; ++c)
-            ret[c] = s[c];
-    }
-    FourChars(unsigned w) // Little-endian
-    {
-        for(unsigned c = 0; c < 4; ++c)
-            ret[c] = static_cast<int8_t>((w >>(c * 8)) & 0xFF);
-    }
-};
-*/
-
 #if defined(ADLMIDI_AUDIO_TICK_HANDLER)
 extern void adl_audioTickHandler(void *instance, uint32_t chipId, uint32_t rate);
 #endif
diff --git a/src/adlmidi_sequencer.cpp b/src/adlmidi_sequencer.cpp
index c315ac3..bb9cec0 100644
--- a/src/adlmidi_sequencer.cpp
+++ b/src/adlmidi_sequencer.cpp
@@ -29,6 +29,7 @@
 #include "midi_sequencer_impl.hpp"
 
 #include "adlmidi_midiplay.hpp"
+#include "adlmidi_opl3.hpp"
 #include "adlmidi_private.hpp"
 
 /****************************************************
diff --git a/src/midi_sequencer.h b/src/midi_sequencer.h
index c6069d7..50e7109 100644
--- a/src/midi_sequencer.h
+++ b/src/midi_sequencer.h
@@ -36,7 +36,7 @@ extern "C" {
 /**
   \brief Real-Time MIDI interface between Sequencer and the Synthesizer
  */
-typedef struct
+typedef struct BW_MidiRtInterface
 {
     /*! Raw MIDI event hook */
     typedef void (*RawEventHook)(void *userdata, uint8_t type, uint8_t subtype, uint8_t channel, const uint8_t *data, size_t len);