10 files changed, 19 insertions, 35 deletions

diff --git a/firmware/export/as3514.h b/firmware/export/as3514.h
index 406857f491..5f37fd7fcf 100644
--- a/firmware/export/as3514.h
+++ b/firmware/export/as3514.h
@@ -21,7 +21,6 @@
 #define _AS3514_H
 
 #include <stdbool.h>
-#include "audiohw.h"
 
 extern int tenthdb2master(int db);
 
diff --git a/firmware/export/audiohw.h b/firmware/export/audiohw.h
index 38e68138c9..3838b007d0 100644
--- a/firmware/export/audiohw.h
+++ b/firmware/export/audiohw.h
@@ -22,6 +22,24 @@
 
 #include "config.h"
 
+#ifdef HAVE_UDA1380
+#include "uda1380.h"
+#elif defined(HAVE_WM8751)
+#include "wm8751.h"
+#elif defined(HAVE_WM8975)
+#include "wm8975.h"
+#elif defined(HAVE_WM8758)
+#include "wm8758.h"
+#elif defined(HAVE_WM8731) || defined(HAVE_WM8721)
+#include "wm8731l.h"
+#elif defined(HAVE_TLV320)
+#include "tlv320.h"
+#elif defined(HAVE_AS3514)
+#include "as3514.h"
+#elif defined(HAVE_MAS35XX)
+#include "mas35xx.h"
+#endif
+
 enum {
     SOUND_VOLUME = 0,
     SOUND_BASS,
diff --git a/firmware/export/mas35xx.h b/firmware/export/mas35xx.h
index 1239454a3f..faf11d035d 100644
--- a/firmware/export/mas35xx.h
+++ b/firmware/export/mas35xx.h
@@ -22,6 +22,4 @@
 #ifndef _MAS35XX_H
 #define _MAS35XX_H
 
-#include "audiohw.h"
-
 #endif /* _MAS35XX_H */
diff --git a/firmware/export/sound.h b/firmware/export/sound.h
index 59e8853e82..929b83b9e6 100644
--- a/firmware/export/sound.h
+++ b/firmware/export/sound.h
@@ -20,26 +20,7 @@
 #define SOUND_H
 
 #include <inttypes.h>
-#ifdef HAVE_UDA1380
-#include "uda1380.h"
-#elif defined(HAVE_WM8751)
-#include "wm8751.h"
-#elif defined(HAVE_WM8975)
-#include "wm8975.h"
-#elif defined(HAVE_WM8758)
-#include "wm8758.h"
-#elif defined(HAVE_WM8731) || defined(HAVE_WM8721)
-#include "wm8731l.h"
-#elif defined(HAVE_TLV320)
-#include "tlv320.h"
-#elif defined(HAVE_AS3514)
-#include "as3514.h"
-#elif defined(HAVE_MAS35XX)
-#include "mas35xx.h"
-#else
-/* For targets without audio */
-#include "audiohw.h"
-#endif
+#include <audiohw.h>
 
 extern void audiohw_postinit(void);
 
diff --git a/firmware/export/tlv320.h b/firmware/export/tlv320.h
index 73cf297a3e..ebb126ddf5 100644
--- a/firmware/export/tlv320.h
+++ b/firmware/export/tlv320.h
@@ -23,8 +23,6 @@
 #define VOLUME_MIN -730
 #define VOLUME_MAX  60
 
-#include "audiohw.h"
-
 extern int tenthdb2master(int db);
 
 /*** definitions ***/
diff --git a/firmware/export/uda1380.h b/firmware/export/uda1380.h
index a92e2a3212..c1fb6421ff 100644
--- a/firmware/export/uda1380.h
+++ b/firmware/export/uda1380.h
@@ -20,8 +20,6 @@
 #ifndef _UDA1380_H
 #define _UDA1380_H
 
-#include "audiohw.h"
-
 /* volume/balance/treble/bass interdependency */
 #define VOLUME_MIN -840
 #define VOLUME_MAX  0
diff --git a/firmware/export/wm8731l.h b/firmware/export/wm8731l.h
index 76b2a9c960..5ef6d694e5 100644
--- a/firmware/export/wm8731l.h
+++ b/firmware/export/wm8731l.h
@@ -24,8 +24,6 @@
 #define VOLUME_MIN -730
 #define VOLUME_MAX  60
 
-#include "audiohw.h"
-
 extern int tenthdb2master(int db);
 extern int tenthdb2mixer(int db);
 
diff --git a/firmware/export/wm8751.h b/firmware/export/wm8751.h
index 85d206cae4..efeaa3609d 100644
--- a/firmware/export/wm8751.h
+++ b/firmware/export/wm8751.h
@@ -23,8 +23,6 @@
 #define VOLUME_MIN -730
 #define VOLUME_MAX  60
 
-#include "audiohw.h"
-
 extern int tenthdb2master(int db);
 extern int tenthdb2mixer(int db);
 
diff --git a/firmware/export/wm8758.h b/firmware/export/wm8758.h
index 7fa2181679..5715f100da 100644
--- a/firmware/export/wm8758.h
+++ b/firmware/export/wm8758.h
@@ -24,8 +24,6 @@
 #define VOLUME_MIN -570
 #define VOLUME_MAX  60
 
-#include "audiohw.h"
-
 extern int tenthdb2master(int db);
 extern int tenthdb2mixer(int db);
 
diff --git a/firmware/export/wm8975.h b/firmware/export/wm8975.h
index bbaa8d3554..c00303a6a8 100644
--- a/firmware/export/wm8975.h
+++ b/firmware/export/wm8975.h
@@ -24,8 +24,6 @@
 #define VOLUME_MIN -730
 #define VOLUME_MAX  60
 
-#include "audiohw.h"
-
 extern int tenthdb2master(int db);
 extern int tenthdb2mixer(int db);