diff --git a/cmd/winfe/mkfiles32/mozilla.mak b/cmd/winfe/mkfiles32/mozilla.mak
index 30b3c99897fa..0026be7b7a57 100644
--- a/cmd/winfe/mkfiles32/mozilla.mak
+++ b/cmd/winfe/mkfiles32/mozilla.mak
@@ -1110,12 +1110,10 @@ $(OUTDIR)\mozilla.dep: $(DEPTH)\cmd\winfe\mkfiles32\mozilla.mak
 	$(DEPTH)\lib\xp\xp_error.c
 	$(DEPTH)\lib\xp\xp_file.c 
 	$(DEPTH)\lib\xp\xp_hash.c
-	$(DEPTH)\lib\xp\xp_md5.c  
 	$(DEPTH)\lib\xp\xp_mesg.c 
 	$(DEPTH)\lib\xp\xp_ncent.c
 	$(DEPTH)\lib\xp\xp_reg.c  
 	$(DEPTH)\lib\xp\xp_rgb.c  
-	$(DEPTH)\lib\xp\xp_sec.c  
 	$(DEPTH)\lib\xp\xp_str.c  
 	$(DEPTH)\lib\xp\xp_thrmo.c
 	$(DEPTH)\lib\xp\xp_time.c 
diff --git a/lib/xp/Makefile b/lib/xp/Makefile
new file mode 100644
index 000000000000..5be8ee5a829a
--- /dev/null
+++ b/lib/xp/Makefile
@@ -0,0 +1,90 @@
+#!gmake
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "NPL"); you may not use this file except in
+# compliance with the NPL.  You may obtain a copy of the NPL at
+# http://www.mozilla.org/NPL/
+#
+# Software distributed under the NPL is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+# for the specific language governing rights and limitations under the
+# NPL.
+#
+# The Initial Developer of this code under the NPL is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+# Reserved.
+
+#  
+
+DEPTH		= ../..
+
+MODULE		= xp
+LIBRARY_NAME	= xp
+
+CSRCS		= xp_alloc.c \
+		  xp_cntxt.c \
+		  xp_core.c \
+		  xp_error.c \
+		  xp_file.c \
+		  xp_hash.c \
+		  xp_list.c \
+		  xp_ncent.c \
+		  xp_reg.c \
+		  xp_rgb.c \
+		  xp_qsort.c \
+		  xp_str.c \
+		  xp_thrmo.c \
+		  xp_time.c \
+		  xp_trace.c \
+		  xp_wrap.c \
+		  xpassert.c \
+		  xplocale.c \
+		  $(NULL)
+
+REQUIRES	= js nspr dbm security img util jtools layer java lay style pref rdf
+
+CSRCS		+= allxpstr.c xp_intl.c
+
+ifeq ($(STAND_ALONE_JAVA),1)
+CSRCS		= xp_qsort.c
+endif
+
+include $(DEPTH)/config/rules.mk
+
+EMACS		= lemacs
+
+AUDIO_FILES	= $(wildcard *.au)
+GIF_FILES	= $(wildcard *.gif)
+JPEG_FILES	= $(wildcard *.jpg)
+
+GEN_OUT		= $(AUDIO_FILES:.au=.h) $(GIF_FILES:.gif=.h) $(JPEG_FILES:.jpg=.h)
+
+#
+# Uncomment these to (re)generate the headers.
+#
+#GARBAGE		+= $(GEN_OUT) $(wildcard *~)
+#
+#all:: $(GEN_OUT)
+
+$(LIBRARY): $(OBJS)
+
+#
+# Generate c header's for various binary files
+#
+.SUFFIXES: .au .gif .jpg
+
+.au.h:
+	@echo generating $*.h from $<...; \
+	CNAME=`echo $*_au`; \
+	$(EMACS) -batch -q -l bin-to-c.el -f batch-bin-to-c $$CNAME $< $*.h
+
+.gif.h:
+	@echo generating $*.h from $<...; \
+	CNAME=`echo $*_gif`; \
+	$(EMACS) -batch -q -l bin-to-c.el -f batch-bin-to-c $$CNAME $< $*.h
+
+.jpg.h:
+	@echo generating $*.h from $<...; \
+	CNAME=`echo $*_jpg`; \
+	$(EMACS) -batch -q -l bin-to-c.el -f batch-bin-to-c $$CNAME $< $*.h