diff --git a/build/moz.configure/compile-checks.configure b/build/moz.configure/compile-checks.configure
index 9f0ebcd61d3e..add416659bda 100644
--- a/build/moz.configure/compile-checks.configure
+++ b/build/moz.configure/compile-checks.configure
@@ -75,12 +75,12 @@ def check_headers(*headers, **kwargs):
     return checks
 
 
-@depends(c_compiler)
-def warnings_cflags(c_compiler):
+@dependable
+def warnings_cflags():
     return []
 
-@depends(cxx_compiler)
-def warnings_cxxflags(cxx_compiler):
+@dependable
+def warnings_cxxflags():
     return []
 
 
diff --git a/build/moz.configure/init.configure b/build/moz.configure/init.configure
index d958f5a00eb5..e1c8f430a710 100644
--- a/build/moz.configure/init.configure
+++ b/build/moz.configure/init.configure
@@ -492,8 +492,8 @@ def host_for_old_configure(host):
 
 add_old_configure_arg(host_for_old_configure)
 
-@depends(host, target)
-def target_for_old_configure(host, target):
+@depends(target)
+def target_for_old_configure(target):
     target_alias = target.alias
     # old-configure does plenty of tests against $target and $target_os
     # and expects darwin for iOS, so make it happy.
@@ -759,10 +759,10 @@ def enabled_in_nightly(milestone, _):
 
 # Set the MOZ_CONFIGURE_OPTIONS variable with all the options that
 # were passed somehow (environment, command line, mozconfig)
-@depends(mozconfig_options)
+@dependable
 @imports(_from='mozbuild.shellutil', _import='quote')
 @imports('__sandbox__')
-def all_configure_options(_):
+def all_configure_options():
     result = []
     previous = None
     for option in __sandbox__._options.itervalues():
diff --git a/build/moz.configure/rust.configure b/build/moz.configure/rust.configure
index 261768f6402e..2b02cd3bdbb6 100644
--- a/build/moz.configure/rust.configure
+++ b/build/moz.configure/rust.configure
@@ -71,13 +71,13 @@ def rust_compiler(value, rustc, rustc_info):
 
 set_config('MOZ_RUST', rust_compiler)
 
-@depends(rust_compiler, rustc, target, cross_compiling)
+@depends(rust_compiler, rustc, target)
 @imports('os')
 @imports('subprocess')
 @imports(_from='mozbuild.configure.util', _import='LineIO')
 @imports(_from='mozbuild.shellutil', _import='quote')
 @imports(_from='tempfile', _import='mkstemp')
-def rust_target(rust_compiler, rustc, target, cross_compiling):
+def rust_target(rust_compiler, rustc, target):
     if rust_compiler:
         # Rust's --target options are similar to, but not exactly the same
         # as, the autoconf-derived targets we use.  An example would be that
diff --git a/build/moz.configure/toolchain.configure b/build/moz.configure/toolchain.configure
index e31ffee0b9c0..25894d6a320e 100644
--- a/build/moz.configure/toolchain.configure
+++ b/build/moz.configure/toolchain.configure
@@ -156,8 +156,8 @@ set_config('MOZ_USING_COMPILER_WRAPPER', using_compiler_wrapper)
 js_option('--with-toolchain-prefix', env='TOOLCHAIN_PREFIX', nargs=1,
           help='Prefix for the target toolchain')
 
-@depends('--with-toolchain-prefix', target, host, cross_compiling)
-def toolchain_prefix(value, target, host, cross_compiling):
+@depends('--with-toolchain-prefix', target, cross_compiling)
+def toolchain_prefix(value, target, cross_compiling):
     if value:
         return tuple(value)
     if cross_compiling:
@@ -883,8 +883,8 @@ def libcxx_inline_visibility(c_compiler, target):
 set_define('_LIBCPP_INLINE_VISIBILITY', libcxx_inline_visibility)
 set_define('_LIBCPP_INLINE_VISIBILITY_EXCEPT_GCC49', libcxx_inline_visibility)
 
-@depends(c_compiler, target, check_build_environment)
-def visibility_flags(c_compiler, target, env):
+@depends(target, check_build_environment)
+def visibility_flags(target, env):
     if target.os != 'WINNT':
         if target.kernel == 'Darwin':
             return ('-fvisibility=hidden', '-fvisibility-inlines-hidden')
diff --git a/toolkit/moz.configure b/toolkit/moz.configure
index 1a8c5b1bb52d..00d2adb668b0 100644
--- a/toolkit/moz.configure
+++ b/toolkit/moz.configure
@@ -793,8 +793,8 @@ set_define('USE_SKIA_GPU', skia_gpu)
 
 option('--enable-skia-pdf', help='Enable Skia PDF')
 
-@depends('--enable-skia-pdf', skia, target)
-def skia_pdf(value, skia, target):
+@depends('--enable-skia-pdf', skia)
+def skia_pdf(value, skia):
     if value.origin == 'default':
         if not skia:
             return None