Don't include alu.h in alMain.h

15 files changed, 29 insertions, 24 deletions

diff --git a/Alc/backends/alsa.c b/Alc/backends/alsa.c
index d43285ad..035d38e9 100644
--- a/Alc/backends/alsa.c
+++ b/Alc/backends/alsa.c
@@ -25,6 +25,7 @@
 #include <memory.h>
 
 #include "alMain.h"
+#include "alu.h"
 
 #include <alsa/asoundlib.h>
 
diff --git a/Alc/backends/coreaudio.c b/Alc/backends/coreaudio.c
index a1ba325a..69a7404a 100644
--- a/Alc/backends/coreaudio.c
+++ b/Alc/backends/coreaudio.c
@@ -25,8 +25,7 @@
 #include <string.h>
 
 #include "alMain.h"
-#include "AL/al.h"
-#include "AL/alc.h"
+#include "alu.h"
 
 #include <CoreServices/CoreServices.h>
 #include <unistd.h>
diff --git a/Alc/backends/dsound.c b/Alc/backends/dsound.c
index 9bb9b2bc..ba144ae3 100644
--- a/Alc/backends/dsound.c
+++ b/Alc/backends/dsound.c
@@ -33,8 +33,7 @@
 #endif
 
 #include "alMain.h"
-#include "AL/al.h"
-#include "AL/alc.h"
+#include "alu.h"
 
 #ifndef DSSPEAKER_5POINT1
 #define DSSPEAKER_5POINT1       6
diff --git a/Alc/backends/loopback.c b/Alc/backends/loopback.c
index 4019d5d7..e1bdd3c1 100644
--- a/Alc/backends/loopback.c
+++ b/Alc/backends/loopback.c
@@ -21,9 +21,9 @@
 #include "config.h"
 
 #include <stdlib.h>
+
 #include "alMain.h"
-#include "AL/al.h"
-#include "AL/alc.h"
+#include "alu.h"
 
 
 static ALCenum loopback_open_playback(ALCdevice *device, const ALCchar *deviceName)
diff --git a/Alc/backends/mmdevapi.c b/Alc/backends/mmdevapi.c
index 8c86b2ca..24314164 100644
--- a/Alc/backends/mmdevapi.c
+++ b/Alc/backends/mmdevapi.c
@@ -39,8 +39,7 @@
 #endif
 
 #include "alMain.h"
-#include "AL/al.h"
-#include "AL/alc.h"
+#include "alu.h"
 
 
 DEFINE_GUID(KSDATAFORMAT_SUBTYPE_PCM, 0x00000001, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71);
diff --git a/Alc/backends/null.c b/Alc/backends/null.c
index 6c6ce0d0..0b58310a 100644
--- a/Alc/backends/null.c
+++ b/Alc/backends/null.c
@@ -21,9 +21,9 @@
 #include "config.h"
 
 #include <stdlib.h>
+
 #include "alMain.h"
-#include "AL/al.h"
-#include "AL/alc.h"
+#include "alu.h"
 
 
 typedef struct {
diff --git a/Alc/backends/opensl.c b/Alc/backends/opensl.c
index 8d8ee72d..a010f9b7 100644
--- a/Alc/backends/opensl.c
+++ b/Alc/backends/opensl.c
@@ -22,9 +22,9 @@
 #include "config.h"
 
 #include <stdlib.h>
+
 #include "alMain.h"
-#include "AL/al.h"
-#include "AL/alc.h"
+#include "alu.h"
 
 
 #include <SLES/OpenSLES.h>
diff --git a/Alc/backends/oss.c b/Alc/backends/oss.c
index ba4345f4..ba11faf0 100644
--- a/Alc/backends/oss.c
+++ b/Alc/backends/oss.c
@@ -30,9 +30,9 @@
 #include <unistd.h>
 #include <errno.h>
 #include <math.h>
+
 #include "alMain.h"
-#include "AL/al.h"
-#include "AL/alc.h"
+#include "alu.h"
 
 #include <sys/soundcard.h>
 
diff --git a/Alc/backends/portaudio.c b/Alc/backends/portaudio.c
index 8d64189c..2f576639 100644
--- a/Alc/backends/portaudio.c
+++ b/Alc/backends/portaudio.c
@@ -23,9 +23,9 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+
 #include "alMain.h"
-#include "AL/al.h"
-#include "AL/alc.h"
+#include "alu.h"
 
 #include <portaudio.h>
 
diff --git a/Alc/backends/pulseaudio.c b/Alc/backends/pulseaudio.c
index accfae73..beae5fac 100644
--- a/Alc/backends/pulseaudio.c
+++ b/Alc/backends/pulseaudio.c
@@ -22,7 +22,9 @@
 #include "config.h"
 
 #include <string.h>
+
 #include "alMain.h"
+#include "alu.h"
 
 #include <pulse/pulseaudio.h>
 
diff --git a/Alc/backends/sndio.c b/Alc/backends/sndio.c
index 56dd9253..771a7b90 100644
--- a/Alc/backends/sndio.c
+++ b/Alc/backends/sndio.c
@@ -23,9 +23,9 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+
 #include "alMain.h"
-#include "AL/al.h"
-#include "AL/alc.h"
+#include "alu.h"
 
 #include <sndio.h>
 
diff --git a/Alc/backends/solaris.c b/Alc/backends/solaris.c
index 18c5ec01..b84bb839 100644
--- a/Alc/backends/solaris.c
+++ b/Alc/backends/solaris.c
@@ -30,9 +30,9 @@
 #include <unistd.h>
 #include <errno.h>
 #include <math.h>
+
 #include "alMain.h"
-#include "AL/al.h"
-#include "AL/alc.h"
+#include "alu.h"
 
 #include <sys/audioio.h>
 
diff --git a/Alc/backends/wave.c b/Alc/backends/wave.c
index fe3817af..ecbfde66 100644
--- a/Alc/backends/wave.c
+++ b/Alc/backends/wave.c
@@ -23,9 +23,9 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <memory.h>
+
 #include "alMain.h"
-#include "AL/al.h"
-#include "AL/alc.h"
+#include "alu.h"
 
 
 typedef struct {
diff --git a/Alc/backends/winmm.c b/Alc/backends/winmm.c
index c7bf4ded..4786d9b4 100644
--- a/Alc/backends/winmm.c
+++ b/Alc/backends/winmm.c
@@ -28,8 +28,7 @@
 #include <mmsystem.h>
 
 #include "alMain.h"
-#include "AL/al.h"
-#include "AL/alc.h"
+#include "alu.h"
 
 #ifndef WAVE_FORMAT_IEEE_FLOAT
 #define WAVE_FORMAT_IEEE_FLOAT  0x0003
diff --git a/Alc/helpers.c b/Alc/helpers.c
index a6ed583f..9529acec 100644
--- a/Alc/helpers.c
+++ b/Alc/helpers.c
@@ -30,6 +30,12 @@
 #ifdef HAVE_CPUID_H
 #include <cpuid.h>
 #endif
+#ifdef HAVE_FLOAT_H
+#include <float.h>
+#endif
+#ifdef HAVE_IEEEFP_H
+#include <ieeefp.h>
+#endif
 
 #if defined(HAVE_GUIDDEF_H) || defined(HAVE_INITGUID_H)
 #define INITGUID