Index: connectivity/source/drivers/mozab/mozillasrc/makefile.mk
===================================================================
--- connectivity/source/drivers/mozab/mozillasrc/makefile.mk	(.../tags/DEV300_m33/connectivity)	(revision 264438)
+++ connectivity/source/drivers/mozab/mozillasrc/makefile.mk	(.../cws/moz2seamonkey01/connectivity)	(revision 264438)
@@ -74,6 +74,8 @@
 	$(SLO)$/MNSTerminateListener.obj
 	
 
+CDEFS     += -DMOZILLA_INTERNAL_API
+
 .IF "$(GUI)"=="UNX"
 .IF "$(COMNAME)"=="sunpro5"
 CFLAGS += -features=tmplife
Index: connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx
===================================================================
--- connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx	(.../tags/DEV300_m33/connectivity)	(revision 264438)
+++ connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx	(.../cws/moz2seamonkey01/connectivity)	(revision 264438)
@@ -48,10 +48,12 @@
 #include <osl/mutex.hxx>
 #include <osl/conditn.hxx>
 
+#include <nsIAbDirFactoryService.h>
 #include <MNSInit.hxx>
 #include <MNameMapper.hxx>
 #include "MNSMozabProxy.hxx"
 #include <MNSDeclares.hxx>
+
 static ::osl::Mutex	m_aMetaMutex;
 
 #include <osl/diagnose.h>
Index: connectivity/source/drivers/mozab/mozillasrc/MNSInclude.hxx
===================================================================
--- connectivity/source/drivers/mozab/mozillasrc/MNSInclude.hxx	(.../tags/DEV300_m33/connectivity)	(revision 264438)
+++ connectivity/source/drivers/mozab/mozillasrc/MNSInclude.hxx	(.../cws/moz2seamonkey01/connectivity)	(revision 264438)
@@ -44,6 +44,7 @@
 #include <nsCOMPtr.h>
 #include <nsISupportsArray.h>
 #include <nsString.h>
+
 #if defined __SUNPRO_CC
 #pragma disable_warn
     // somewhere in the files included directly or indirectly in nsString.h, warnings are enabled, again
Index: connectivity/source/drivers/mozab/bootstrap/MNSInit.cxx
===================================================================
--- connectivity/source/drivers/mozab/bootstrap/MNSInit.cxx	(.../tags/DEV300_m33/connectivity)	(revision 264438)
+++ connectivity/source/drivers/mozab/bootstrap/MNSInit.cxx	(.../cws/moz2seamonkey01/connectivity)	(revision 264438)
@@ -34,12 +34,13 @@
 
 #include "mozilla_nsinit.h"
 
+#include <MNSInit.hxx>
+
 #include <sal/types.h>
 #include <osl/diagnose.h>
 #include <osl/conditn.hxx>
 #include <osl/file.hxx>
 #include <rtl/bootstrap.hxx>
-#include <MNSInit.hxx>
 
 #ifndef CONNECTIVITY_MOZAB_MCONFIGACCESS_HXX
 #include "MConfigAccess.hxx"
Index: connectivity/source/drivers/mozab/bootstrap/makefile.mk
===================================================================
--- connectivity/source/drivers/mozab/bootstrap/makefile.mk	(.../tags/DEV300_m33/connectivity)	(revision 264438)
+++ connectivity/source/drivers/mozab/bootstrap/makefile.mk	(.../cws/moz2seamonkey01/connectivity)	(revision 264438)
@@ -84,6 +84,8 @@
 	$(SLO)$/MNSProfileDirServiceProvider.obj
 .ENDIF
 
+CDEFS     += -DMOZILLA_INTERNAL_API
+
 .IF "$(GUI)"=="UNX"
 .IF "$(COMNAME)"=="sunpro5"
 CFLAGS += -features=tmplife
Index: connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx
===================================================================
--- connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx	(.../tags/DEV300_m33/connectivity)	(revision 264438)
+++ connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx	(.../cws/moz2seamonkey01/connectivity)	(revision 264438)
@@ -30,6 +30,7 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_connectivity.hxx"
+
 #include "MMozillaBootstrap.hxx"
 
 using namespace com::sun::star::uno;
Index: connectivity/source/drivers/mozab/makefile.mk
===================================================================
--- connectivity/source/drivers/mozab/makefile.mk	(.../tags/DEV300_m33/connectivity)	(revision 264438)
+++ connectivity/source/drivers/mozab/makefile.mk	(.../cws/moz2seamonkey01/connectivity)	(revision 264438)
@@ -64,13 +64,13 @@
 
 .IF "$(OS)"=="WNT" 
 .IF "$(COM)"=="GCC"
-MOZ_LIB_XPCOM= -L$(MOZ_LIB) -lembed_base_s -lnspr4 -lmozreg_s -lxpcom
+MOZ_LIB_XPCOM= -L$(MOZ_LIB) -lembed_base_s -lnspr4 -lmozreg_s -lxpcom -lxpcom_core
 .ELSE
 LIB += $(MOZ_LIB)
-MOZ_LIB_XPCOM= $(MOZ_EMBED_LIB) $(MOZ_LIB)$/nspr4.lib $(MOZ_REG_LIB) $(MOZ_LIB)$/xpcom.lib
+MOZ_LIB_XPCOM= $(MOZ_EMBED_LIB) $(MOZ_LIB)$/nspr4.lib $(MOZ_REG_LIB) $(MOZ_LIB)$/xpcom.lib $(MOZ_LIB)$/xpcom_core.lib
 .ENDIF
 .ELSE "$(OS)"=="WNT" 
-MOZ_LIB_XPCOM= -L$(MOZ_LIB) -lembed_base_s -lnspr4 -lmozreg_s -lxpcom
+MOZ_LIB_XPCOM= -L$(MOZ_LIB) -lnspr4 -lxpcom_core -lmozreg_s -lembed_base_s
 .ENDIF
 #End of mozilla specific stuff.