diff --git a/src/components/script/dom/bindings/codegen/CodegenRust.py b/src/components/script/dom/bindings/codegen/CodegenRust.py
index b9bd9a54ae8..29345fca6f2 100644
--- a/src/components/script/dom/bindings/codegen/CodegenRust.py
+++ b/src/components/script/dom/bindings/codegen/CodegenRust.py
@@ -5248,23 +5248,64 @@ class CGBindingRoot(CGThing):
         #       not every binding ever.
         curr = CGImports(descriptors,
                          dictionaries,
-                         ['js::*',
-                          'js::jsapi::*',
-                          'js::jsfriendapi::bindgen::*',
-                          'js::glue::*',
+                         ['js::{crust, JS_ARGV, JS_CALLEE, JS_THIS_OBJECT}',
+                          'js::{JSCLASS_GLOBAL_SLOT_COUNT, JSCLASS_IS_DOMJSCLASS}',
+                          'js::{JSCLASS_IS_GLOBAL, JSCLASS_RESERVED_SLOTS_SHIFT}',
+                          'js::{JSCLASS_RESERVED_SLOTS_MASK, JSID_VOID, JSJitInfo}',
+                          'js::{JSPROP_ENUMERATE, JSPROP_NATIVE_ACCESSORS, JSPROP_SHARED}',
+                          'js::{JSRESOLVE_ASSIGNING, JSRESOLVE_QUALIFIED, JSVAL_NULL}',
+                          'js::{JSVAL_IS_OBJECT, JSVAL_TO_OBJECT, JSVAL_VOID}',
+                          'js::jsapi::{JS_CallFunctionValue, JS_GetClass, JS_GetGlobalForObject}',
+                          'js::jsapi::{JS_GetObjectPrototype, JS_GetProperty, JS_GetPropertyById}',
+                          'js::jsapi::{JS_GetPropertyDescriptorById, JS_GetReservedSlot}',
+                          'js::jsapi::{JS_HasProperty, JS_HasPropertyById, JS_IsExceptionPending}',
+                          'js::jsapi::{JS_NewObject, JS_ObjectIsCallable, JS_SetPrototype}',
+                          'js::jsapi::{JS_SetReservedSlot, JS_WrapValue, JSBool, JSContext}',
+                          'js::jsapi::{JSClass, JSFreeOp, JSFunctionSpec, JSHandleObject, jsid}',
+                          'js::jsapi::{JSNativeWrapper, JSObject, JSPropertyDescriptor}',
+                          'js::jsapi::{JSPropertyOpWrapper, JSPropertySpec}',
+                          'js::jsapi::{JSStrictPropertyOpWrapper, JSString, JSTracer, JSVal}',
+                          'js::glue::{CallJitMethodOp, CallJitPropertyOp, CreateProxyHandler}',
+                          'js::glue::{GetProxyPrivate, NewProxyObject, ProxyTraps}',
+                          'js::glue::{RUST_BOOLEAN_TO_JSVAL, RUST_FUNCTION_VALUE_TO_JITINFO}',
+                          'js::glue::{RUST_INT_TO_JSVAL, RUST_JS_NumberValue, RUST_JSID_IS_STRING}',
+                          'js::glue::{RUST_JSVAL_IS_NULL, RUST_JSVAL_IS_PRIMITIVE}',
+                          'js::glue::{RUST_JSVAL_IS_VOID, RUST_JSVAL_TO_OBJECT}',
+                          'js::glue::{RUST_JSVAL_TO_PRIVATE, RUST_OBJECT_TO_JSVAL}',
+                          'js::glue::{RUST_PRIVATE_TO_JSVAL, RUST_UINT_TO_JSVAL}',
                           'dom::types::*',
                           'dom::bindings::js::JS',
-                          'dom::bindings::utils::*',
+                          'dom::bindings::utils::{CreateDOMGlobal, CreateInterfaceObjects2}',
+                          'dom::bindings::utils::{ConstantSpec, cx_for_dom_object, Default}',
+                          'dom::bindings::utils::{dom_object_slot, DOM_OBJECT_SLOT, DOMClass}',
+                          'dom::bindings::utils::{DOMJSClass, domstring_to_jsval, Empty}',
+                          'dom::bindings::utils::{FindEnumStringIndex, GetArrayIndexFromId}',
+                          'dom::bindings::utils::{GetPropertyOnPrototype, GetProtoOrIfaceArray}',
+                          'dom::bindings::utils::{GetReflector, HasPropertyOnPrototype, IntVal}',
+                          'dom::bindings::utils::{jsid_to_str, jsval_to_domstring, jsval_to_str}',
+                          'dom::bindings::utils::{NativePropertyHooks}',
+                          'dom::bindings::utils::global_object_for_js_object',
+                          'dom::bindings::utils::{Reflectable}',
+                          'dom::bindings::utils::{squirrel_away_unique, str_to_jsval}',
+                          'dom::bindings::utils::{ThrowingConstructor,  unwrap, unwrap_jsmanaged}',
+                          'dom::bindings::utils::{unwrap_object, VoidVal, with_gc_disabled}',
+                          'dom::bindings::utils::{with_gc_enabled, XrayResolveProperty}',
                           'dom::bindings::trace::Traceable',
-                          'dom::bindings::callback::*',
-                          'dom::bindings::error::{FailureUnknown, Fallible, Error, ErrorResult, throw_method_failed_with_details, throw_not_in_union}',
-                          'dom::bindings::conversions::*',
-                          'dom::bindings::codegen::*', #XXXjdm
-                          'dom::bindings::codegen::UnionTypes::*', #XXXjdm
-                          'dom::bindings::codegen::UnionConversions::*', #XXXjdm
+                          'dom::bindings::callback::{CallbackContainer,CallbackInterface}',
+                          'dom::bindings::callback::{CallSetup,ExceptionHandling}',
+                          'dom::bindings::callback::{WrapCallThisObject}',
+                          'dom::bindings::conversions::JSValConvertible',
+                          'dom::bindings::codegen::*',
+                          'dom::bindings::codegen::UnionTypes::*',
+                          'dom::bindings::codegen::UnionConversions::*',
+                          'dom::bindings::error::{FailureUnknown, Fallible, Error, ErrorResult}',
+                          'dom::bindings::error::{throw_method_failed_with_details}',
+                          'dom::bindings::error::{throw_not_in_union}',
                           'script_task::JSPageInfo',
                           'dom::bindings::proxyhandler',
-                          'dom::bindings::proxyhandler::*',
+                          'dom::bindings::proxyhandler::{_obj_toString, defineProperty}',
+                          'dom::bindings::proxyhandler::{FillPropertyDescriptor, GetExpandoObject}',
+                          'dom::bindings::proxyhandler::{getPropertyDescriptor}',
                           'servo_util::str::DOMString',
                           'servo_util::vec::zip_copies',
                           'std::cast',
@@ -6399,13 +6440,36 @@ class GlobalGenRoots():
         # Add include guards.
         #curr = CGIncludeGuard('UnionConversions', curr)
 
-        curr = CGImports([], [], ['dom::bindings::utils::unwrap_jsmanaged',
-                                  'dom::bindings::codegen::UnionTypes::*',
-                                  'dom::bindings::codegen::PrototypeList',
-                                  'dom::bindings::conversions::JSValConvertible',
-                                  'js::*',
-                                  'js::jsapi::*',
-                                  'js::glue::*'], [], curr)
+        curr = CGImports([], [], [
+                          'dom::bindings::utils::unwrap_jsmanaged',
+                          'dom::bindings::codegen::UnionTypes::*',
+                          'dom::bindings::codegen::PrototypeList',
+                          'dom::bindings::conversions::JSValConvertible',
+                          'js::{crust, JS_ARGV, JS_CALLEE, JS_THIS_OBJECT}',
+                          'js::{JSCLASS_GLOBAL_SLOT_COUNT, JSCLASS_IS_DOMJSCLASS}',
+                          'js::{JSCLASS_IS_GLOBAL, JSCLASS_RESERVED_SLOTS_SHIFT}',
+                          'js::{JSCLASS_RESERVED_SLOTS_MASK, JSID_VOID, JSJitInfo}',
+                          'js::{JSPROP_ENUMERATE, JSPROP_NATIVE_ACCESSORS, JSPROP_SHARED}',
+                          'js::{JSRESOLVE_ASSIGNING, JSRESOLVE_QUALIFIED, JSVAL_NULL}',
+                          'js::{JSVAL_IS_OBJECT, JSVAL_TO_OBJECT, JSVAL_VOID}',
+                          'js::jsapi::{JS_CallFunctionValue, JS_GetClass, JS_GetGlobalForObject}',
+                          'js::jsapi::{JS_GetObjectPrototype, JS_GetProperty, JS_GetPropertyById}',
+                          'js::jsapi::{JS_GetPropertyDescriptorById, JS_GetReservedSlot}',
+                          'js::jsapi::{JS_HasProperty, JS_HasPropertyById, JS_IsExceptionPending}',
+                          'js::jsapi::{JS_NewObject, JS_ObjectIsCallable, JS_SetPrototype}',
+                          'js::jsapi::{JS_SetReservedSlot, JS_WrapValue, JSBool, JSContext}',
+                          'js::jsapi::{JSClass, JSFreeOp, JSFunctionSpec, JSHandleObject, jsid}',
+                          'js::jsapi::{JSNativeWrapper, JSObject, JSPropertyDescriptor}',
+                          'js::jsapi::{JSPropertyOpWrapper, JSPropertySpec}',
+                          'js::jsapi::{JSStrictPropertyOpWrapper, JSString, JSTracer, JSVal}',
+                          'js::glue::{CallJitMethodOp, CallJitPropertyOp, CreateProxyHandler}',
+                          'js::glue::{GetProxyPrivate, NewProxyObject, ProxyTraps}',
+                          'js::glue::{RUST_BOOLEAN_TO_JSVAL, RUST_FUNCTION_VALUE_TO_JITINFO}',
+                          'js::glue::{RUST_INT_TO_JSVAL, RUST_JS_NumberValue, RUST_JSID_IS_STRING}',
+                          'js::glue::{RUST_JSVAL_IS_NULL, RUST_JSVAL_IS_PRIMITIVE}',
+                          'js::glue::{RUST_JSVAL_IS_VOID, RUST_JSVAL_TO_OBJECT}',
+                          'js::glue::{RUST_JSVAL_TO_PRIVATE, RUST_OBJECT_TO_JSVAL}',
+                          'js::glue::{RUST_PRIVATE_TO_JSVAL, RUST_UINT_TO_JSVAL}',], [], curr)
 
         # Add the auto-generated comment.
         curr = CGWrapper(curr, pre=AUTOGENERATED_WARNING_COMMENT)