diff --git a/Makefile.in b/Makefile.in
index 0f0f875ae3e..dad52716089 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -199,7 +199,7 @@ SRC_script = $(call rwildcard,$(S)src/components/script/,*.rs) $(AUTOGEN_SRC_scr
 CRATE_script = $(S)src/components/script/script.rc
 DONE_script = $(B)src/components/script/libscript.dummy
 
-DEPS_script = $(CRATE_script) $(SRC_script) $(DONE_SUBMODULES) $(DONE_util) $(DONE_net)
+DEPS_script = $(CRATE_script) $(SRC_script) $(DONE_SUBMODULES) $(DONE_util) $(DONE_net) $(DONE_gfx)
 
 RFLAGS_servo = $(strip $(CFG_RUSTC_FLAGS)) $(addprefix -L $(B)src/,$(DEPS_SUBMODULES)) -L $(B)src/components/gfx -L $(B)src/components/util -L $(B)src/components/net -L $(B)src/components/script
 
diff --git a/mk/clean.mk b/mk/clean.mk
index 273d8090f29..c08d51e9709 100644
--- a/mk/clean.mk
+++ b/mk/clean.mk
@@ -26,16 +26,16 @@ clean-fast: $(DEPS_CLEAN_TARGETS_FAST) clean-servo
 	$(Q)echo "$(filter-out $(SLOW_BUILDS),$(DEPS_CLEAN_ALL))"
 
 clean-util:
-	cd $(B)/src/components/util/ && rm -rf libservo_util*.dylib $(DONE_servo_util)
+	cd $(B)/src/components/util/ && rm -rf libutil*.dylib $(DONE_util)
 
 clean-net:
-	cd $(B)/src/components/net/ && rm -rf libservo_net*.dylib $(DONE_servo_net)
+	cd $(B)/src/components/net/ && rm -rf libnet*.dylib $(DONE_net)
 
 clean-gfx:
-	cd $(B)/src/components/gfx/ && rm -rf libservo_gfx*.dylib $(DONE_servo_gfx)
+	cd $(B)/src/components/gfx/ && rm -rf libgfx*.dylib $(DONE_gfx)
 
 clean-script:
-	cd $(B)/src/components/script/ && rm -rf libservo_script*.dylib $(DONE_servo_script)
+	cd $(B)/src/components/script/ && rm -rf libscript*.dylib $(DONE_script)
 
 clean-servo: clean-gfx clean-util clean-net clean-script
 	rm -f servo servo-test