diff --git a/modules/rdf/src/ht.c b/modules/rdf/src/ht.c
index 8a849583cd7..ff5d80d957b 100644
--- a/modules/rdf/src/ht.c
+++ b/modules/rdf/src/ht.c
@@ -843,9 +843,9 @@ void
 sortNodes(HT_View view, HT_Resource parent, HT_Resource *children, uint32 numChildren)
 {
 	RDF_BT			containerType;
-	PRBool			descendingFlag, sortChanged = false;
-	void			*sortToken;
-	uint32			sortTokenType;
+	PRBool			descendingFlag = false, sortChanged = false;
+	void			*sortToken = NULL;
+	uint32			sortTokenType = 0;
 	uint32			startIndex, loop;
 
 	XP_ASSERT(view != NULL);
@@ -1224,7 +1224,7 @@ HT_PaneFromURL(char *url, HT_Notification n, PRBool autoFlush, int32 param_count
                char** param_names, char** param_values)
 {
 	HT_Pane			pane = NULL;
-	RDF			db;
+	RDF			db = NULL;
 	RDF_Resource		r;
 	char			*dbstr[2];
         char*                   dburl = getBaseURL(url);
diff --git a/modules/rdf/src/ht.h b/modules/rdf/src/ht.h
index cfbe693e0f6..285d573acae 100644
--- a/modules/rdf/src/ht.h
+++ b/modules/rdf/src/ht.h
@@ -349,9 +349,9 @@ PRBool				implicitDomainURL (char* url);
 PRBool				domainMatches (char *dom, char *url);
 void				nextDomain (char* dom, size_t *n);
 PRBool				relatedLinksEnabledURL (char* url);
-
-HT_Pane newTemplatePane(char* templateName);
-void PaneDeleteSBPCleanup (HT_Pane htPane);
+void				cleanupInt (HT_Pane htPane, HT_URLSiteMapAssoc *nsmp, RDF_Resource parent);
+HT_Pane				newTemplatePane(char* templateName);
+void				PaneDeleteSBPCleanup (HT_Pane htPane);
 
 XP_END_PROTOS