diff --git a/webshell/tests/viewer/Makefile.in b/webshell/tests/viewer/Makefile.in
index 80e5d40d7da..b3e1be95717 100644
--- a/webshell/tests/viewer/Makefile.in
+++ b/webshell/tests/viewer/Makefile.in
@@ -109,7 +109,7 @@ XP_DIST_LIBS		= \
 
 ifeq ($(OS_ARCH),WINNT)
 RESFILE		= viewer.res
-XP_DIST_LIBS	+= -lxpwidgets_s -ldbgrobot
+XP_DIST_LIBS    += -lxpwidgets_s -ldbgrobot -lwidget_windows
 endif
 
 ifdef MOZ_OJI
@@ -175,6 +175,10 @@ endif
 
 CXXFLAGS		+= $(MOZ_TOOLKIT_REGISTRY_CFLAGS)
 
+ifeq ($(OS_ARCH),WINNT)
+DEFINES		+= -DUSE_LOCAL_WIDGETS
+endif
+
 GARBAGE			+= $(PROGRAM)_gtk $(PROGRAM)_qt $(PROGRAM)_xlib
 
 ifeq ($(OS_ARCH),WINNT)
diff --git a/webshell/tests/viewer/public/Makefile.in b/webshell/tests/viewer/public/Makefile.in
index 181157e6591..993f61469b0 100644
--- a/webshell/tests/viewer/public/Makefile.in
+++ b/webshell/tests/viewer/public/Makefile.in
@@ -31,6 +31,10 @@ MODULE		= webshell_tests
 EXPORTS		= \
 		nsIXPBaseWindow.h \
 		nsIWindowListener.h \
+		nsIButton.h \
+		nsILabel.h \
+        	nsICheckButton.h \
+        	nsITextWidget.h	\
 		$(NULL)
 
 EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))