9 files changed, 4 insertions, 9 deletions

diff --git a/apps/codecs.c b/apps/codecs.c
index 3fa05be59a..88478e8566 100644
--- a/apps/codecs.c
+++ b/apps/codecs.c
@@ -36,7 +36,6 @@
 #include "kernel.h"
 #include "screens.h"
 #include "misc.h"
-#include "mas.h"
 #include "codecs.h"
 #include "lang.h"
 #include "keyboard.h"
diff --git a/apps/debug_menu.c b/apps/debug_menu.c
index 2497b17826..bedc98ae10 100644
--- a/apps/debug_menu.c
+++ b/apps/debug_menu.c
@@ -61,7 +61,6 @@
 #include "rtc.h"
 #include "storage.h"
 #include "fat.h"
-#include "mas.h"
 #include "eeprom_24cxx.h"
 #if (CONFIG_STORAGE & STORAGE_MMC) || (CONFIG_STORAGE & STORAGE_SD)
 #include "sdmmc.h"
diff --git a/apps/menus/recording_menu.c b/apps/menus/recording_menu.c
index 6a1c1d31e8..8eaeab699c 100644
--- a/apps/menus/recording_menu.c
+++ b/apps/menus/recording_menu.c
@@ -49,7 +49,6 @@
 #endif
 #ifdef HAVE_RECORDING
 #include "peakmeter.h"
-#include "mas.h"
 #endif
 #include "splash.h"
 #if CONFIG_CODEC == SWCODEC
diff --git a/apps/mpeg.c b/apps/mpeg.c
index 62fda5e3cb..583e4e2122 100644
--- a/apps/mpeg.c
+++ b/apps/mpeg.c
@@ -45,7 +45,7 @@
 #include "settings.h"
 #ifndef SIMULATOR
 #include "i2c.h"
-#include "mas.h"
+#include "mas35xx.h"
 #include "system.h"
 #include "usb.h"
 #include "file.h"
@@ -53,7 +53,7 @@
 #endif /* !SIMULATOR */
 #ifdef HAVE_LCD_BITMAP
 #include "lcd.h"
-#endif
+#endif /* CONFIG_CODEC != SWCODEC */
 
 #define MPEG_SWAP_CHUNKSIZE  0x2000
 #define MPEG_HIGH_WATER  2 /* We leave 2 bytes empty because otherwise we
diff --git a/apps/plugin.h b/apps/plugin.h
index 56e0bfcd04..0503980c1e 100644
--- a/apps/plugin.h
+++ b/apps/plugin.h
@@ -77,7 +77,7 @@ void* plugin_get_buffer(size_t *buffer_size);
 #include "recording.h"
 #endif
 #else
-#include "mas.h"
+#include "mas35xx.h"
 #endif /* CONFIG_CODEC == SWCODEC */
 #include "settings.h"
 #include "timer.h"
diff --git a/apps/radio/radio.c b/apps/radio/radio.c
index 6f1903d79c..5fe1fabef0 100644
--- a/apps/radio/radio.c
+++ b/apps/radio/radio.c
@@ -23,7 +23,6 @@
 #include <stdio.h>
 #include <stdbool.h>
 #include <stdlib.h>
-#include "mas.h"
 #include "settings.h"
 #include "button.h"
 #include "status.h"
diff --git a/apps/recorder/peakmeter.c b/apps/recorder/peakmeter.c
index 2450559b8d..aacfc23cee 100644
--- a/apps/recorder/peakmeter.c
+++ b/apps/recorder/peakmeter.c
@@ -22,7 +22,6 @@
 #if defined(SIMULATOR) && (CONFIG_CODEC != SWCODEC)
 #include <stdlib.h> /* sim uses rand for peakmeter simulation */
 #endif
-#include "mas.h"
 #include "thread.h"
 #include "kernel.h"
 #include "settings.h"
diff --git a/apps/recorder/peakmeter.h b/apps/recorder/peakmeter.h
index 308e5fb916..4abcc154f3 100644
--- a/apps/recorder/peakmeter.h
+++ b/apps/recorder/peakmeter.h
@@ -22,6 +22,7 @@
 #define __PEAKMETER_H__
 
 #define PEAK_METER_FPS 20
+#define MAX_PEAK 0x8000
 
 /*#define PM_DEBUG */
 #ifdef PM_DEBUG 
diff --git a/apps/recorder/recording.c b/apps/recorder/recording.c
index 9adb3c1839..fdeae03f9b 100644
--- a/apps/recorder/recording.c
+++ b/apps/recorder/recording.c
@@ -42,7 +42,6 @@
 #include "pcm_record.h"
 #include "recording.h"
 #include "mp3_playback.h"
-#include "mas.h"
 #include "button.h"
 #include "kernel.h"
 #include "settings.h"