From ed25a5005f97b826f9ab00afd3cb9f39889e9283 Mon Sep 17 00:00:00 2001
From: Mike Blumenkrantz <zmike@osg.samsung.com>
Date: Fri, 6 May 2016 13:38:09 -0400
Subject: [PATCH] clean up mixer includes

config.h needs to be included. always.
---
 src/modules/mixer/lib/backends/pulseaudio/pulse.c | 10 ++++++----
 src/modules/mixer/lib/emix.h                      |  4 ++++
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/modules/mixer/lib/backends/pulseaudio/pulse.c b/src/modules/mixer/lib/backends/pulseaudio/pulse.c
index f88273477..8c2cf4153 100644
--- a/src/modules/mixer/lib/backends/pulseaudio/pulse.c
+++ b/src/modules/mixer/lib/backends/pulseaudio/pulse.c
@@ -1,9 +1,11 @@
-#include <Eina.h>
-#include <Ecore.h>
-#include <pulse/pulseaudio.h>
-
+#include "e.h"
 #include "emix.h"
 
+#include <pulse/pulseaudio.h>
+
+#undef ERR
+#undef DBG
+#undef WRN
 #define ERR(...)      EINA_LOG_ERR(__VA_ARGS__)
 #define DBG(...)      EINA_LOG_DBG(__VA_ARGS__)
 #define WRN(...)      EINA_LOG_WARN(__VA_ARGS__)
diff --git a/src/modules/mixer/lib/emix.h b/src/modules/mixer/lib/emix.h
index 25376fea0..d1772206b 100644
--- a/src/modules/mixer/lib/emix.h
+++ b/src/modules/mixer/lib/emix.h
@@ -1,6 +1,10 @@
 #ifndef EMIX_H
 #define EMIX_H
 
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #include <Eina.h>
 #include <Evas.h>