diff --git a/apps/SOURCES b/apps/SOURCES
index d34d7b8b30..6005460a5a 100644
--- a/apps/SOURCES
+++ b/apps/SOURCES
@@ -159,12 +159,11 @@ radio/radioart.c
 #endif
 #endif
 
-fixedpoint.c
-
 #if CONFIG_CODEC == SWCODEC
 #if INPUT_SRC_CAPS != 0
 audio_path.c
 #endif /* INPUT_SRC_CAPS != 0 */
+fixedpoint.c
 pcmbuf.c
 codec_thread.c
 playback.c
diff --git a/firmware/sound.c b/firmware/sound.c
index e6cfe57cf5..f8358c690d 100644
--- a/firmware/sound.c
+++ b/firmware/sound.c
@@ -25,7 +25,6 @@
 #include "config.h"
 #include "system.h"
 #include "sound.h"
-#include "fixedpoint.h"
 #ifdef HAVE_SW_VOLUME_CONTROL
 #include "pcm_sw_volume.h"
 #endif /* HAVE_SW_VOLUME_CONTROL */
@@ -128,8 +127,10 @@ static int current_eq_band_gain[AUDIOHW_EQ_BAND_NUM]; /* tenth dB */
 /* Return the sound value scaled to centibels (tenth-decibels) */
 static int sound_value_to_cb(int setting, int value)
 {
-    long e = (1 - sound_numdecimals(setting)) << 16;
-    return fp_mul(value, fp_exp10(e, 16), 16);
+    int shift = 1 - sound_numdecimals(setting);
+    if (shift < 0) do { value /= 10; } while (++shift);
+    if (shift > 0) do { value *= 10; } while (--shift);
+    return value;
 }
 
 static void set_prescaled_volume(void)