diff --git a/config/rules.mk b/config/rules.mk
index 9fb32fad2853..bcb304db9833 100644
--- a/config/rules.mk
+++ b/config/rules.mk
@@ -899,7 +899,7 @@ ifdef DIST_INSTALL
 ifdef IS_COMPONENT
 	$(error Shipping static component libs makes no sense.)
 else
-	$(INSTALL) $(IFLAGS1) $(LIBRARY) $(FAKE_LIBRARY) $(DIST)/lib
+	$(INSTALL) $(IFLAGS1) $(LIBRARY) $(DIST)/lib
 endif
 endif # DIST_INSTALL
 endif # LIBRARY
diff --git a/js/src/config/rules.mk b/js/src/config/rules.mk
index 9fb32fad2853..bcb304db9833 100644
--- a/js/src/config/rules.mk
+++ b/js/src/config/rules.mk
@@ -899,7 +899,7 @@ ifdef DIST_INSTALL
 ifdef IS_COMPONENT
 	$(error Shipping static component libs makes no sense.)
 else
-	$(INSTALL) $(IFLAGS1) $(LIBRARY) $(FAKE_LIBRARY) $(DIST)/lib
+	$(INSTALL) $(IFLAGS1) $(LIBRARY) $(DIST)/lib
 endif
 endif # DIST_INSTALL
 endif # LIBRARY
diff --git a/widget/src/windows/tests/Makefile.in b/widget/src/windows/tests/Makefile.in
index cbba2565c60e..f2dcea649c69 100644
--- a/widget/src/windows/tests/Makefile.in
+++ b/widget/src/windows/tests/Makefile.in
@@ -49,12 +49,16 @@ LOCAL_INCLUDES =  -I$(srcdir)/../   \
 
 LIBS = ../$(LIB_PREFIX)widget_windows.$(LIB_SUFFIX) \
        ../../xpwidgets/$(LIB_PREFIX)xpwidgets_s.$(LIB_SUFFIX) \
+       gkgfx \
+       thebes \
        $(DIST)/lib/$(LIB_PREFIX)thebes.$(LIB_SUFFIX) \
        $(XPCOM_LIBS) \
        $(MOZ_UNICHARUTIL_LIBS) \
        $(NULL)
 
-OS_LIBS += $(call EXPAND_LIBNAME,ole32 shell32)
+EXTRA_DSO_LDOPTS += $(LIBS_DIR)
+
+OS_LIBS += $(call EXPAND_LIBNAME,ole32 shell32 comctl32 comdlg32 imm32 shlwapi winspool)
 
 CPP_UNIT_TESTS = TestWinDND.cpp \
                  $(NULL)