--- a/media/libaom/moz.build
+++ b/media/libaom/moz.build
@@ -13,58 +13,58 @@ include('sources.mozbuild')
 if CONFIG['CPU_ARCH'] == 'x86_64':
     EXPORTS.aom += files['X64_EXPORTS']
     SOURCES += files['X64_SOURCES']
     USE_YASM = True
     if CONFIG['OS_TARGET'] == 'WINNT':
         if CONFIG['CC_TYPE'] == 'gcc':
             ASFLAGS += [ '-I%s/media/libaom/config/win/mingw64/' % TOPSRCDIR ]
             LOCAL_INCLUDES += [ '/media/libaom/config/win/mingw64/' ]
-            EXPORTS.aom += [ 'config/win/mingw64/aom_config.h' ]
+            EXPORTS.aom += [ 'config/win/mingw64/config/aom_config.h' ]
         else:
             ASFLAGS += [ '-I%s/media/libaom/config/win/x64/' % TOPSRCDIR ]
             LOCAL_INCLUDES += [ '/media/libaom/config/win/x64/' ]
-            EXPORTS.aom += [ 'config/win/x64/aom_config.h' ]
+            EXPORTS.aom += [ 'config/win/x64/config/aom_config.h' ]
             # This code is not included in our PGO profile, and pointlessly
             # PGO-optimizing it slows down our builds a lot.
             NO_PGO = True
     elif CONFIG['OS_TARGET'] == 'Darwin':
         ASFLAGS += [ '-I%s/media/libaom/config/mac/x64/' % TOPSRCDIR ]
         LOCAL_INCLUDES += [ '/media/libaom/config/mac/x64/' ]
-        EXPORTS.aom += [ 'config/mac/x64/aom_config.h' ]
+        EXPORTS.aom += [ 'config/mac/x64/config/aom_config.h' ]
     else: # Android, Linux, BSDs, etc.
         ASFLAGS += [ '-I%s/media/libaom/config/linux/x64/' % TOPSRCDIR ]
         LOCAL_INCLUDES += [ '/media/libaom/config/linux/x64/' ]
-        EXPORTS.aom += [ 'config/linux/x64/aom_config.h' ]
+        EXPORTS.aom += [ 'config/linux/x64/config/aom_config.h' ]
 elif CONFIG['CPU_ARCH'] == 'x86':
     EXPORTS.aom += files['IA32_EXPORTS']
     SOURCES += files['IA32_SOURCES']
     USE_YASM = True
     if CONFIG['OS_TARGET'] == 'WINNT':
         if CONFIG['CC_TYPE'] == 'gcc':
             ASFLAGS += [ '-I%s/media/libaom/config/win/mingw32/' % TOPSRCDIR ]
             LOCAL_INCLUDES += [ '/media/libaom/config/win/mingw32/' ]
-            EXPORTS.aom += [ 'config/win/mingw32/aom_config.h' ]
+            EXPORTS.aom += [ 'config/win/mingw32/config/aom_config.h' ]
         else:
             ASFLAGS += [ '-I%s/media/libaom/config/win/ia32/' % TOPSRCDIR ]
             LOCAL_INCLUDES += [ '/media/libaom/config/win/ia32/' ]
-            EXPORTS.aom += [ 'config/win/ia32/aom_config.h' ]
+            EXPORTS.aom += [ 'config/win/ia32/config/aom_config.h' ]
             NO_PGO = True # Compiler OOMs, bug 1445922
     else: # Android, Linux, BSDs, etc.
         ASFLAGS += [ '-I%s/media/libaom/config/linux/ia32/' % TOPSRCDIR ]
         LOCAL_INCLUDES += [ '/media/libaom/config/linux/ia32/' ]
-        EXPORTS.aom += [ 'config/linux/ia32/aom_config.h' ]
+        EXPORTS.aom += [ 'config/linux/ia32/config/aom_config.h' ]
 elif CONFIG['CPU_ARCH'] == 'arm':
     EXPORTS.aom += files['ARM_EXPORTS']
     ASFLAGS += [
         '-I%s/media/libaom/config/linux/arm/' % TOPSRCDIR,
         '-I%s/libaom' % OBJDIR,
     ]
     LOCAL_INCLUDES += [ '/media/libaom/config/linux/arm/' ]
-    EXPORTS.aom += [ 'config/linux/arm/aom_config.h' ]
+    EXPORTS.aom += [ 'config/linux/arm/config/aom_config.h' ]
 
     arm_asm_files = files['ARM_SOURCES']
 
     if CONFIG['VPX_AS_CONVERSION']:
         SOURCES += sorted([
             "!%s.S" % f if f.endswith('.asm') else f for f in arm_asm_files
         ])
     else:
@@ -84,17 +84,17 @@ elif CONFIG['CPU_ARCH'] == 'arm':
             '-no-integrated-as',
         ]
 else:
     # Generic C-only configuration
     EXPORTS.aom += files['GENERIC_EXPORTS']
     SOURCES += files['GENERIC_SOURCES']
     ASFLAGS += [ '-I%s/media/libaom/config/generic/' % TOPSRCDIR ]
     LOCAL_INCLUDES += [ '/media/libaom/config/generic/' ]
-    EXPORTS.aom += [ 'config/generic/aom_config.h' ]
+    EXPORTS.aom += [ 'config/generic/config/aom_config.h' ]
 
 # We allow warnings for third-party code that can be updated from upstream.
 AllowCompilerWarnings()
 
 FINAL_LIBRARY = 'gkmedias'
 
 if CONFIG['OS_TARGET'] == 'Android':
     # Older versions of the Android NDK don't pre-define anything to indicate