diff --git a/config/external/moz.build b/config/external/moz.build
index 0ea3a2d5e0e60edf6ed1a3ace6a2bf0523ad959e..f3db212c01e5ccf7ef298b45ce8d31a9b0a91985 100644
--- a/config/external/moz.build
+++ b/config/external/moz.build
@@ -42,7 +42,7 @@ if not CONFIG['MOZ_SYSTEM_PNG']:
     external_dirs += ['media/libpng']
 
 if CONFIG['CPU_ARCH'] == 'arm':
-    external_dirs += ['media/openmax_dl']
+    external_dirs += ['media/openmax_dl/dl']
 
 if CONFIG['MOZ_FFVPX']:
     external_dirs += ['media/ffvpx']
diff --git a/media/moz.build b/media/moz.build
index 9077f26c1994ee4c88fae4ce1836a45457810108..a525566ae1784be20ef8e8dfe01cf59b398ad593 100644
--- a/media/moz.build
+++ b/media/moz.build
@@ -10,6 +10,9 @@ with Files("**"):
 with Files("update-libjpeg.sh"):
     BUG_COMPONENT = ("Core", "ImageLib")
 
+with Files("openmax_dl/**"):
+    BUG_COMPONENT = ("Core", "Web Audio")
+
 with Files("openmax_il/**"):
     BUG_COMPONENT = ("Core", "Audio/Video: Playback")
 
diff --git a/media/openmax_dl/dl/Makefile.in b/media/openmax_dl/dl/Makefile.in
deleted file mode 100644
index d1bf329134697772a708a4b2168fab9f123dfeae..0000000000000000000000000000000000000000
--- a/media/openmax_dl/dl/Makefile.in
+++ /dev/null
@@ -1,7 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-ifeq (WINNT,$(OS_TARGET))
-VISIBILITY_FLAGS =
-endif
diff --git a/media/openmax_dl/moz.build b/media/openmax_dl/moz.build
deleted file mode 100644
index 65219262fd0614dbdb79c08250c400a6bcf7397c..0000000000000000000000000000000000000000
--- a/media/openmax_dl/moz.build
+++ /dev/null
@@ -1,10 +0,0 @@
-# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-with Files("**"):
-    BUG_COMPONENT = ("Core", "Web Audio")
-
-DIRS += ['dl']
\ No newline at end of file