diff --git a/mozilla/modules/rdf/src/makefile.win b/mozilla/modules/rdf/src/makefile.win
index 7cb392fbf75..d5758b07544 100644
--- a/mozilla/modules/rdf/src/makefile.win
+++ b/mozilla/modules/rdf/src/makefile.win
@@ -45,8 +45,8 @@ LIBRARY_NAME=rdf
 REQUIRES=nspr dbm java js htmldlgs util img layer pref
 CSRCS=bmk2mcf.c vocab.c  nlcstore.c mcf.c mcff2mcf.c rdfht.c \
     remstore.c ht.c glue.c utils.c fs2rdf.c hist2rdf.c \
-    rdfparse.c   es2mcf.c columns.c  xmlparse.c \
-    xmlglue.c xmlss.c scook.c \
+    rdfparse.c   es2mcf.c columns.c   \
+     scook.c \
 
 C_OBJS=.\$(OBJDIR)\bmk2mcf.obj .\$(OBJDIR)\vocab.obj \
      .\$(OBJDIR)\nlcstore.obj \
@@ -56,8 +56,7 @@ C_OBJS=.\$(OBJDIR)\bmk2mcf.obj .\$(OBJDIR)\vocab.obj \
     .\$(OBJDIR)\hist2rdf.obj .\$(OBJDIR)\rdfparse.obj \
      .\$(OBJDIR)\es2mcf.obj \
     .\$(OBJDIR)\columns.obj  \
-    .\$(OBJDIR)\xmlparse.obj .\$(OBJDIR)\xmlglue.obj \
-    .\$(OBJDIR)\xmlss.obj .\$(OBJDIR)\scook.obj 
+    .\$(OBJDIR)\scook.obj 
 !if "$(MOZ_BITS)" != "16"
 LINCS=-I$(XPDIST)\public\nspr -I$(XPDIST)\public\dbm \
     -I$(XPDIST)\public\java -I$(XPDIST)\public\js \
diff --git a/mozilla/modules/rdf/src/rdf-int.h b/mozilla/modules/rdf/src/rdf-int.h
index a448e3d201e..8af4996c6fa 100644
--- a/mozilla/modules/rdf/src/rdf-int.h
+++ b/mozilla/modules/rdf/src/rdf-int.h
@@ -279,7 +279,7 @@ PLHashNumber idenHash(const void* key);
 
 int16 charSearch(const char c,const  char* string);
 int16 revCharSearch(const char c, const char* string);
-PRBool startsWith(const char* startPattern,const  char* string);
+PR_PUBLIC_API(PRBool) startsWith(const char* startPattern,const  char* string);
 PRBool endsWith(const char* endPattern,const  char* string);
 PRBool inverseTV(PRBool tv);
 void createBootstrapResources();
diff --git a/mozilla/modules/rdf/src/rdfparse.c b/mozilla/modules/rdf/src/rdfparse.c
index a947bb2ca2f..2432797ea21 100644
--- a/mozilla/modules/rdf/src/rdfparse.c
+++ b/mozilla/modules/rdf/src/rdfparse.c
@@ -127,7 +127,7 @@ freeNamespaces (RDFFile f)
 
 
 
-char *
+PR_PUBLIC_API(char *)
 getAttributeValue (char** attlist, char* elName)
 {
   size_t n = 0;
diff --git a/mozilla/modules/rdf/src/rdfparse.h b/mozilla/modules/rdf/src/rdfparse.h
index 8663dbb4d25..ccfecee585c 100644
--- a/mozilla/modules/rdf/src/rdfparse.h
+++ b/mozilla/modules/rdf/src/rdfparse.h
@@ -42,7 +42,7 @@ XP_BEGIN_PROTOS
 char *		getHref(char** attlist);
 int		parseNextRDFXMLBlob (NET_StreamClass *stream, char* blob, int32 size);
 void		parseRDFProcessingInstruction (RDFFile f, char* token);
-char *		getAttributeValue (char** attlist, char* elName);
+PR_PUBLIC_API(char *)		getAttributeValue (char** attlist, char* elName);
 PRBool		tagEquals (RDFFile f, char* tag1, char* tag2);
 void		addElementProps (char** attlist, char* elementName, RDFFile f, RDF_Resource obj);
 PRBool		knownObjectElement (char* eln);
diff --git a/mozilla/modules/rdf/src/utils.c b/mozilla/modules/rdf/src/utils.c
index 24482fb7d59..982ef0bba64 100644
--- a/mozilla/modules/rdf/src/utils.c
+++ b/mozilla/modules/rdf/src/utils.c
@@ -264,7 +264,7 @@ endsWith (const char* pattern, const char* uuid)
 
 
 
-PRBool
+PR_PUBLIC_API(PRBool)
 startsWith (const char* pattern, const char* uuid)
 {
   short l1 = strlen(pattern);
diff --git a/mozilla/modules/rdf/src/utils.h b/mozilla/modules/rdf/src/utils.h
index 998bab65bdd..8eecf1adcc6 100644
--- a/mozilla/modules/rdf/src/utils.h
+++ b/mozilla/modules/rdf/src/utils.h
@@ -56,7 +56,7 @@ void		stringAppendBase (char* dest, const char* addition);
 void		stringAppend (char* dest, const char* addition);
 int16		charSearch (const char c, const char* data);
 PRBool		endsWith (const char* pattern, const char* uuid);
-PRBool		startsWith (const char* pattern, const char* uuid);
+
 PRBool		substring (const char* pattern, const char* data);
 int16		revCharSearch (const char c, const char* data);
 PRBool		urlEquals (const char* url1, const char* url2);