From ec58abacfbe79b3bd72b8bb13bcde8ede81cf784 Mon Sep 17 00:00:00 2001
From: Chris Robinson <chris.kcat@gmail.com>
Date: Thu, 16 Nov 2017 02:32:51 -0800
Subject: [PATCH] Cleanup some includes

---
 include/AL/alure2.h | 24 +++++++++++++-----------
 src/auxeffectslot.h |  4 ++--
 src/buffer.h        |  4 ++--
 src/context.h       |  4 ++--
 src/device.h        |  4 ++--
 5 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/include/AL/alure2.h b/include/AL/alure2.h
index 02a9b56..5d9c812 100644
--- a/include/AL/alure2.h
+++ b/include/AL/alure2.h
@@ -1,6 +1,9 @@
 #ifndef AL_ALURE2_H
 #define AL_ALURE2_H
 
+#include <type_traits>
+#include <utility>
+#include <tuple>
 #include <cmath>
 
 #include "alc.h"
@@ -11,19 +14,18 @@
 #include "alure2-typeviews.h"
 
 #ifndef ALURE_API
- #if defined(ALURE_STATIC_LIB)
-  #define ALURE_API
- #elif defined(_WIN32)
-  #define ALURE_API __declspec(dllimport)
- #elif defined(__GNUC__)
-  #define ALURE_API __attribute__((visibility("default")))
- #elif defined(__has_attribute)
-  #if __has_attribute(visibility)
+ #ifndef ALURE_STATIC_LIB
+  #if defined(_WIN32)
+   #define ALURE_API __declspec(dllimport)
+  #elif defined(__has_attribute)
+   #if __has_attribute(visibility)
+    #define ALURE_API __attribute__((visibility("default")))
+   #endif
+  #elif defined(__GNUC__)
    #define ALURE_API __attribute__((visibility("default")))
-  #else
-   #define ALURE_API
   #endif
- #else
+ #endif
+ #ifndef ALURE_API
   #define ALURE_API
  #endif
 #endif /* ALURE_API */
diff --git a/src/auxeffectslot.h b/src/auxeffectslot.h
index a17dab6..7bac1ae 100644
--- a/src/auxeffectslot.h
+++ b/src/auxeffectslot.h
@@ -1,10 +1,10 @@
 #ifndef AUXEFFECTSLOT_H
 #define AUXEFFECTSLOT_H
 
-#include "main.h"
-
 #include <algorithm>
 
+#include "main.h"
+
 namespace alure {
 
 class AuxiliaryEffectSlotImpl {
diff --git a/src/buffer.h b/src/buffer.h
index e057659..4e398a2 100644
--- a/src/buffer.h
+++ b/src/buffer.h
@@ -1,10 +1,10 @@
 #ifndef BUFFER_H
 #define BUFFER_H
 
-#include "main.h"
-
 #include <algorithm>
 
+#include "main.h"
+
 namespace alure {
 
 ALenum GetFormat(ChannelConfig chans, SampleType type);
diff --git a/src/context.h b/src/context.h
index 67c59ec..cb9f28f 100644
--- a/src/context.h
+++ b/src/context.h
@@ -1,8 +1,6 @@
 #ifndef CONTEXT_H
 #define CONTEXT_H
 
-#include "main.h"
-
 #include <condition_variable>
 #include <unordered_map>
 #include <stdexcept>
@@ -17,6 +15,8 @@
 #include "mpark/variant.hpp"
 #endif
 
+#include "main.h"
+
 #include "device.h"
 #include "source.h"
 
diff --git a/src/device.h b/src/device.h
index 9d50587..fa52535 100644
--- a/src/device.h
+++ b/src/device.h
@@ -1,10 +1,10 @@
 #ifndef DEVICE_H
 #define DEVICE_H
 
-#include "main.h"
-
 #include <mutex>
 
+#include "main.h"
+
 
 namespace alure {
 
-- 
2.11.4.GIT