diff --git a/firmware/SOURCES b/firmware/SOURCES
index 8ea7abe610..f17ee5d330 100644
--- a/firmware/SOURCES
+++ b/firmware/SOURCES
@@ -2066,8 +2066,6 @@ target/hosted/ibasso/sysfs-ibasso.c
 target/hosted/ibasso/system-ibasso.c
 target/hosted/ibasso/usb-ibasso.c
 target/hosted/ibasso/vold-ibasso.c
-target/hosted/ibasso/tinyalsa/mixer.c
-target/hosted/ibasso/tinyalsa/pcm.c
 #ifdef DX50
 target/hosted/ibasso/dx50/audiohw-dx50.c
 target/hosted/ibasso/dx50/button-dx50.c
@@ -2078,6 +2076,11 @@ target/hosted/ibasso/dx90/button-dx90.c
 #endif
 #endif
 
+#ifdef USE_TINYALSA
+target/hosted/tinyalsa/mixer.c
+target/hosted/tinyalsa/pcm.c
+#endif
+
 #if (CONFIG_PLATFORM & PLATFORM_CTRU)
 asm/arm/lcd-as-memframe.S
 target/hosted/ctru/backlight-ctru.c
diff --git a/firmware/target/hosted/ibasso/tinyalsa/include/sound/asound.h b/firmware/target/hosted/tinyalsa/include/sound/asound.h
similarity index 100%
rename from firmware/target/hosted/ibasso/tinyalsa/include/sound/asound.h
rename to firmware/target/hosted/tinyalsa/include/sound/asound.h
diff --git a/firmware/target/hosted/ibasso/tinyalsa/include/tinyalsa/asoundlib.h b/firmware/target/hosted/tinyalsa/include/tinyalsa/asoundlib.h
similarity index 100%
rename from firmware/target/hosted/ibasso/tinyalsa/include/tinyalsa/asoundlib.h
rename to firmware/target/hosted/tinyalsa/include/tinyalsa/asoundlib.h
diff --git a/firmware/target/hosted/ibasso/tinyalsa/mixer.c b/firmware/target/hosted/tinyalsa/mixer.c
similarity index 100%
rename from firmware/target/hosted/ibasso/tinyalsa/mixer.c
rename to firmware/target/hosted/tinyalsa/mixer.c
diff --git a/firmware/target/hosted/ibasso/tinyalsa/pcm.c b/firmware/target/hosted/tinyalsa/pcm.c
similarity index 100%
rename from firmware/target/hosted/ibasso/tinyalsa/pcm.c
rename to firmware/target/hosted/tinyalsa/pcm.c
diff --git a/tools/configure b/tools/configure
index 81dc247b10..e674e557a3 100755
--- a/tools/configure
+++ b/tools/configure
@@ -4150,6 +4150,7 @@ fi
     bootoutput="rockbox"
     appextra="recorder:gui:hosted"
     plugins="yes"
+    tinyalsa="yes"
     # architecture, manufacturer and model for the target-tree build
     t_cpu="hosted"
     t_manufacturer="ibasso"
@@ -4174,6 +4175,7 @@ fi
     bootoutput="rockbox"
     appextra="recorder:gui:hosted"
     plugins="yes"
+    tinyalsa="yes"
     # architecture, manufacturer and model for the target-tree build
     t_cpu="hosted"
     t_manufacturer="ibasso"
@@ -5134,13 +5136,16 @@ if test -n "$t_cpu"; then
   elif [ "$simulator" = "yes" ]; then # a few more includes for the sim target tree
     TARGET_INC="$TARGET_INC -I\$(FIRMDIR)/target/hosted/sdl"
     TARGET_INC="$TARGET_INC -I\$(FIRMDIR)/target/hosted"
-  elif [ "$t_manufacturer" = "ibasso" ]; then
-    TARGET_INC="$TARGET_INC -I\$(FIRMDIR)/target/hosted/ibasso/tinyalsa/include"
   elif [ "$application" = "yes" ] && [ "$t_manufacturer" = "ctru" ]; then
     TARGET_INC="$TARGET_INC -I\$(FIRMDIR)/target/hosted/ctru/lib"
     TARGET_INC="$TARGET_INC -I\$(FIRMDIR)/target/hosted/ctru/lib/bfile"
   fi
 
+  if [ "$tinyalsa" = "yes" ]; then
+      TARGET_INC="$TARGET_INC -I\$(FIRMDIR)/target/hosted/tinyalsa/include"
+      extradefines="$extradefines -DUSE_TINYALSA"
+  fi
+
   TARGET_INC="$TARGET_INC -I\$(FIRMDIR)/target/$t_cpu/$t_manufacturer"
   test -n "$t_soc" && TARGET_INC="$TARGET_INC -I\$(FIRMDIR)/target/$t_cpu/$t_soc"
   TARGET_INC="$TARGET_INC -I\$(FIRMDIR)/target/$t_cpu"