diff --git a/mailnews/base/search/public/nsMsgSearchArray.h b/mailnews/base/search/public/nsMsgSearchArray.h
index fe872eff3a21..9872ee44ec92 100644
--- a/mailnews/base/search/public/nsMsgSearchArray.h
+++ b/mailnews/base/search/public/nsMsgSearchArray.h
@@ -23,7 +23,7 @@
 
 class nsMsgSearchTerm;
 class nsMsgSearchScopeTerm;
-class nsMsgSearchValue;
+struct nsMsgSearchValue;
 
 class nsMsgSearchTermArray : public nsVoidArray
 {
diff --git a/mailnews/base/search/src/Makefile.in b/mailnews/base/search/src/Makefile.in
index dbe2d27d6c9a..fb2d83797bbb 100644
--- a/mailnews/base/search/src/Makefile.in
+++ b/mailnews/base/search/src/Makefile.in
@@ -22,8 +22,8 @@ srcdir		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-MODULE = msgsearch
-LIBRARY_NAME=search_s
+MODULE=msgsearch
+LIBRARY_NAME=msgsearch_s
 
 EXPORTS = nsMsgFilterService.h \
 	$(NULL)
diff --git a/mailnews/base/search/src/makefile.win b/mailnews/base/search/src/makefile.win
index 157c9398db73..8405dd122511 100644
--- a/mailnews/base/search/src/makefile.win
+++ b/mailnews/base/search/src/makefile.win
@@ -20,7 +20,7 @@ IGNORE_MANIFEST=1
 
 include <$(DEPTH)\config\config.mak>
 
-LIBRARY_NAME=msgsearch
+LIBRARY_NAME=msgsearch_s
 MODULE=msgsearch
 
 DEFINES=-D_IMPL_NS_HTML