diff --git a/mozilla/cmd/xfe/XfeWidgets/XfeWidgets.mk b/mozilla/cmd/xfe/XfeWidgets/XfeWidgets.mk
index 970399b3bc2..c9bd2016716 100644
--- a/mozilla/cmd/xfe/XfeWidgets/XfeWidgets.mk
+++ b/mozilla/cmd/xfe/XfeWidgets/XfeWidgets.mk
@@ -206,22 +206,6 @@ XFE_STATIC_LIBS			+= $(XFE_STATIC_CAPTION_LIB)
 
 endif
 
-##
-## XfeComboBox Library
-##
-XFE_STATIC_COMBO_BOX_LIB	= $(DIST)/lib/libXfeComboBox.a
-XFE_SHARED_COMBO_BOX_LIB	= $(DIST)/bin/libXfeComboBox.$(DLL_SUFFIX)
-XFE_COMBO_BOX_REQUIRES		= XfeComboBox
-
-##
-## XfeComboBox required ?
-##
-ifeq ($(filter $(REQUIRES),$(XFE_COMBO_BOX_REQUIRES)),$(XFE_COMBO_BOX_REQUIRES))
-
-XFE_SHARED_LIBS			+= $(XFE_SHARED_COMBO_BOX_LIB)
-XFE_STATIC_LIBS			+= $(XFE_STATIC_COMBO_BOX_LIB)
-
-endif
 
 ##
 ## Xfe Pref Library
@@ -283,6 +267,23 @@ XFE_STATIC_LIBS			+= $(XFE_STATIC_TOOL_BAR_LIB)
 
 endif
 
+##
+## XfeComboBox Library
+##
+XFE_STATIC_COMBO_BOX_LIB	= $(DIST)/lib/libXfeComboBox.a
+XFE_SHARED_COMBO_BOX_LIB	= $(DIST)/bin/libXfeComboBox.$(DLL_SUFFIX)
+XFE_COMBO_BOX_REQUIRES		= XfeComboBox
+
+##
+## XfeComboBox required ?
+##
+ifeq ($(filter $(REQUIRES),$(XFE_COMBO_BOX_REQUIRES)),$(XFE_COMBO_BOX_REQUIRES))
+
+XFE_SHARED_LIBS			+= $(XFE_SHARED_COMBO_BOX_LIB)
+XFE_STATIC_LIBS			+= $(XFE_STATIC_COMBO_BOX_LIB)
+
+endif
+
 ##
 ## XfeBm required ?
 ##
diff --git a/mozilla/cmd/xfe/XfeWidgets/tests/XfeToolBar/Makefile b/mozilla/cmd/xfe/XfeWidgets/tests/XfeToolBar/Makefile
index 1f5c133195d..82aab89e492 100644
--- a/mozilla/cmd/xfe/XfeWidgets/tests/XfeToolBar/Makefile
+++ b/mozilla/cmd/xfe/XfeWidgets/tests/XfeToolBar/Makefile
@@ -32,6 +32,7 @@ CSRCS			= \
 REQUIRES		= \
 				XfeTest \
 				XfeToolBar \
+				XfeComboBox \
 				XfeBm \
 				XfeWidgets
 
diff --git a/mozilla/cmd/xfe/XfeWidgets/tests/XfeToolBar/Makefile.in b/mozilla/cmd/xfe/XfeWidgets/tests/XfeToolBar/Makefile.in
index 4c57d93de0a..dd7efa1214c 100644
--- a/mozilla/cmd/xfe/XfeWidgets/tests/XfeToolBar/Makefile.in
+++ b/mozilla/cmd/xfe/XfeWidgets/tests/XfeToolBar/Makefile.in
@@ -37,6 +37,7 @@ CSRCS			= \
 REQUIRES		= \
 				XfeTest \
 				XfeToolBar \
+				XfeComboBox \
 				XfeBm \
 				XfeWidgets