diff --git a/cmd/xfe/XfeWidgets/XfeWidgets.mk b/cmd/xfe/XfeWidgets/XfeWidgets.mk
index 3ca7d438bd70..81362b9083e3 100644
--- a/cmd/xfe/XfeWidgets/XfeWidgets.mk
+++ b/cmd/xfe/XfeWidgets/XfeWidgets.mk
@@ -72,22 +72,27 @@ ifeq ($(OS_ARCH),Linux)
 
   -include $(DEPTH)/config/motif.mk
 
-  XFE_X_CC_FLAGS		= -I/usr/X11R6/include
+  XFE_X_CC_FLAGS		= $(MOZILLA_XFE_X11_INCLUDE_FLAGS)
 
-  XFE_XM_CC_FLAGS		=
+  XFE_XM_CC_FLAGS		= $(MOZILLA_XFE_MOTIF_INCLUDE_FLAGS)
 
-  XFE_X_LD_PATH			= -L/usr/X11R6/lib
+  XFE_X_LD_PATH			= $(MOZILLA_XFE_X11_DYNAMIC_PATHS)
 
-  XFE_XM_LD_PATH		=
+  XFE_XM_LD_PATH		= $(MOZILLA_XFE_MOTIF_DYNAMIC_PATHS)
 
   XFE_XM_LIBS			=\
-						$(MOZILLA_XM_2_1_BROKEN_LOCALE_FLAGS) \
-						-lXm \
-						$(MOZILLA_XM_2_1_PRINT_SHELL_FLAGS)
+						$(MOZILLA_XFE_GLIBC_BROKEN_LOCALE_FLAGS) \
+						$(MOZILLA_XFE_MOTIF_DYNAMIC_FLAGS) \
+						$(MOZILLA_XFE_MOTIF_PRINT_SHELL_FLAGS)
 
   XFE_XT_LIBS			= -lXt
 
-  XFE_X_LIBS			= -lXmu -lXext -lX11 -lSM -lICE
+  XFE_X_LIBS			=\
+						$(MOZILLA_XFE_MOTIF_XPM_FLAGS) \
+						-lXmu \
+						-lXext \
+						-lX11 \
+						$(MOZILLA_XFE_X11_SM_FLAGS)
 
   XFE_USE_NATIVE_XPM	= True