--- a/allmakefiles.sh
+++ b/allmakefiles.sh
@@ -494,16 +494,17 @@ MAKEFILES_rdf="
 rdf/Makefile
 rdf/base/Makefile
 rdf/base/idl/Makefile
 rdf/base/public/Makefile
 rdf/base/src/Makefile
 rdf/util/Makefile
 rdf/util/public/Makefile
 rdf/util/src/Makefile
+rdf/util/src/internal/Makefile
 rdf/build/Makefile
 rdf/datasource/Makefile
 rdf/datasource/public/Makefile
 rdf/datasource/src/Makefile
 rdf/tests/Makefile
 rdf/tests/rdfcat/Makefile
 rdf/tests/rdfpoll/Makefile
 "

--- a/rdf/build/Makefile.in
+++ b/rdf/build/Makefile.in
@@ -69,17 +69,17 @@ CPPSRCS		= \
 
 SHARED_LIBRARY_LIBS = \
 		../base/src/$(LIB_PREFIX)rdfbase_s.$(LIB_SUFFIX) \
 		../datasource/src/$(LIB_PREFIX)rdfdatasource_s.$(LIB_SUFFIX) \
 		$(NULL)
 
 ifndef MOZ_ENABLE_LIBXUL
 SHARED_LIBRARY_LIBS += \
-		../util/src/$(LIB_PREFIX)rdfutil_s.$(LIB_SUFFIX) \
+		../util/src/internal/$(LIB_PREFIX)rdfutil_s.$(LIB_SUFFIX) \
 		$(NULL)
 endif
 
 EXTRA_DSO_LDOPTS = \
 		$(LIBS_DIR) \
 		$(EXTRA_DSO_LIBS) \
 		$(MOZ_UNICHARUTIL_LIBS) \
 		$(MOZ_COMPONENT_LIBS) \

--- a/rdf/util/public/nsRDFResource.h
+++ b/rdf/util/public/nsRDFResource.h
@@ -37,18 +37,19 @@
 
 #ifndef nsRDFResource_h__
 #define nsRDFResource_h__
 
 #include "nsCOMPtr.h"
 #include "nsIRDFNode.h"
 #include "nsIRDFResource.h"
 #include "nscore.h"
-#include "nsString.h"
+#include "nsStringGlue.h"
 #include "rdf.h"
+
 class nsIRDFService;
 
 /**
  * This simple base class implements nsIRDFResource, and can be used as a
  * superclass for more sophisticated resource implementations.
  */
 class nsRDFResource : public nsIRDFResource {
 public:

--- a/rdf/util/src/Makefile.in
+++ b/rdf/util/src/Makefile.in
@@ -37,23 +37,29 @@
 
 DEPTH		= ../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
+# This makefile builds the rdfutil_external_s library which should be 
+# used by frozen (dependent) linkage components. The internal-linkage code should use
+# rdfutil_s which is built in the internal/ subdirectory. 
+
+DIRS = internal
+
 include $(srcdir)/objs.mk
 
 EXTRA_DEPS += $(srcdir)/objs.mk
 
 MODULE		= rdfutil
-LIBRARY_NAME	= rdfutil_s
-MOZILLA_INTERNAL_API = 1
+LIBRARY_NAME	= rdfutil_external_s
+DIST_INSTALL = 1
 
 REQUIRES	= xpcom \
 		  string \
 		  rdf \
 		  $(NULL)
 
 CPPSRCS		= $(RDF_UTIL_SRC_LCPPSRCS)
 

new file mode 100644
--- /dev/null
+++ b/rdf/util/src/internal/Makefile.in
@@ -0,0 +1,71 @@
+#
+# ***** BEGIN LICENSE BLOCK *****
+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Original Code is mozilla.org code.
+#
+# The Initial Developer of the Original Code is
+# Netscape Communications Corporation.
+# Portions created by the Initial Developer are Copyright (C) 1998
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either of the GNU General Public License Version 2 or later (the "GPL"),
+# or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+# in which case the provisions of the GPL or the LGPL are applicable instead
+# of those above. If you wish to allow use of your version of this file only
+# under the terms of either the GPL or the LGPL, and not to allow others to
+# use your version of this file under the terms of the MPL, indicate your
+# decision by deleting the provisions above and replace them with the notice
+# and other provisions required by the GPL or the LGPL. If you do not delete
+# the provisions above, a recipient may use your version of this file under
+# the terms of any one of the MPL, the GPL or the LGPL.
+#
+# ***** END LICENSE BLOCK *****
+
+DEPTH		= ../../../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+# This makefile builds the version of unicharutils_s static library which uses
+# internal linkage. Components that use frozen (external) linkage should use
+# rdfutil_external_s.
+
+include $(srcdir)/../objs.mk
+
+EXTRA_DEPS += $(srcdir)/../objs.mk
+
+MODULE		= rdfutil
+LIBRARY_NAME	= rdfutil_s
+MOZILLA_INTERNAL_API = 1
+
+REQUIRES	= xpcom \
+		  string \
+		  rdf \
+		  $(NULL)
+
+CPPSRCS		= $(RDF_UTIL_SRC_LCPPSRCS)
+
+# we don't want the shared lib, but we want to force the creation of a static lib.
+FORCE_STATIC_LIB = 1
+
+include $(topsrcdir)/config/rules.mk
+
+$(RDF_UTIL_SRC_LCPPSRCS): %: $(srcdir)/../%
+	$(INSTALL) $^ .
+

--- a/rdf/util/src/nsRDFResource.cpp
+++ b/rdf/util/src/nsRDFResource.cpp
@@ -32,23 +32,23 @@
  * decision by deleting the provisions above and replace them with the notice
  * and other provisions required by the GPL or the LGPL. If you do not delete
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
 
 #include "nsRDFResource.h"
-#include "nsCRT.h"
 #include "nsIServiceManager.h"
 #include "nsIRDFDelegateFactory.h"
 #include "nsIRDFService.h"
 #include "nsRDFCID.h"
-#include "nsXPIDLString.h"
 #include "prlog.h"
+#include "nsComponentManagerUtils.h"
+#include "nsServiceManagerUtils.h"
 
 static NS_DEFINE_CID(kRDFServiceCID, NS_RDFSERVICE_CID);
 
 nsIRDFService* nsRDFResource::gRDFService = nsnull;
 nsrefcnt nsRDFResource::gRDFServiceRefCnt = 0;
 
 ////////////////////////////////////////////////////////////////////////////////