diff --git a/mozilla/mailnews/import/resources/content/Makefile.in b/mozilla/mailnews/import/resources/content/Makefile.in
index f71336455fb..40895816481 100644
--- a/mozilla/mailnews/import/resources/content/Makefile.in
+++ b/mozilla/mailnews/import/resources/content/Makefile.in
@@ -28,7 +28,7 @@ include $(DEPTH)/config/autoconf.mk
 
 EXPORT_RESOURCE_CONTENT = \
 		$(srcdir)/importDialog.xul \
-		$(srcdir)/importDialog.xul \
+		$(srcdir)/importDialog.js 	\
 		$(srcdir)/importProgress.xul \
 		$(srcdir)/importProgress.js \
 		$(srcdir)/fieldMapImport.xul \
diff --git a/mozilla/mailnews/import/src/Makefile.in b/mozilla/mailnews/import/src/Makefile.in
index f8fc0aea10a..3c35660a564 100644
--- a/mozilla/mailnews/import/src/Makefile.in
+++ b/mozilla/mailnews/import/src/Makefile.in
@@ -26,7 +26,8 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME	= import
+MODULE = import
+LIBRARY_NAME = import
 IS_COMPONENT	= 1
 
 CPPSRCS		= 	\
@@ -40,7 +41,7 @@ CPPSRCS		= 	\
 			ImportTranslate.cpp				\
 			nsImportTranslator.cpp			\
 			ImportCharSet.cpp				\
-			ImportOutFile.cpp				\	
+			ImportOutFile.cpp				\
 			nsImportScanFile.cpp			\
 			nsImportEncodeScan.cpp			\
 			nsImportMimeEncode.cpp			\
@@ -48,12 +49,13 @@ CPPSRCS		= 	\
 			$(NULL)
 
 
+include $(topsrcdir)/config/rules.mk
+
 EXTRA_DSO_LDOPTS = \
 	-L$(DIST)/bin \
 	$(NSPR_LIBS) \
 	-lxpcom \
 	$(NULL)
 
-include $(topsrcdir)/config/rules.mk
 
 
diff --git a/mozilla/mailnews/import/src/nsImportAddressBooks.cpp b/mozilla/mailnews/import/src/nsImportAddressBooks.cpp
index b108270e2ec..fcdd684e15d 100644
--- a/mozilla/mailnews/import/src/nsImportAddressBooks.cpp
+++ b/mozilla/mailnews/import/src/nsImportAddressBooks.cpp
@@ -289,7 +289,7 @@ NS_IMETHODIMP nsImportGenericAddressBooks::GetData(const char *dataId, nsISuppor
 			rNum += (*pNum - '0');
 			pNum++;
 		}
-		IMPORT_LOG1( "Requesting sample data #: %ld\n", rNum);
+		IMPORT_LOG1( "Requesting sample data #: %ld\n", (long)rNum);
 		if (m_pInterface) {
 			nsCOMPtr<nsISupportsWString>	data;
 			rv = nsComponentManager::CreateInstance( kSupportsWStringCID, nsnull, kISupportsWStringIID, getter_AddRefs( data));
@@ -412,7 +412,7 @@ void nsImportGenericAddressBooks::GetDefaultLocation( void)
 	if (m_description)
 		nsCRT::free( m_description);
 	m_description = nsnull;
-	nsresult rv = m_pInterface->GetAutoFind( &m_description, &m_autoFind);
+	m_pInterface->GetAutoFind( &m_description, &m_autoFind);
 	m_gotLocation = PR_TRUE;
 	if (m_autoFind) {
 		m_found = PR_TRUE;
@@ -421,7 +421,7 @@ void nsImportGenericAddressBooks::GetDefaultLocation( void)
 	}
 
 	nsIFileSpec *	pLoc = nsnull;
-	rv = m_pInterface->GetDefaultLocation( &pLoc, &m_found, &m_userVerify);
+	m_pInterface->GetDefaultLocation( &pLoc, &m_found, &m_userVerify);
 	if (!m_pLocation)
 		m_pLocation = pLoc;
 	else {
diff --git a/mozilla/mailnews/import/src/nsImportMail.cpp b/mozilla/mailnews/import/src/nsImportMail.cpp
index 6677bc58abd..13a3ab546a0 100644
--- a/mozilla/mailnews/import/src/nsImportMail.cpp
+++ b/mozilla/mailnews/import/src/nsImportMail.cpp
@@ -64,7 +64,6 @@
 #include "nsIMsgAccountManager.h"
 #include "nsIMsgMailSession.h"
 #include "nsMsgBaseCID.h"
-#include "nsPOP3IncomingServer.h"
 #include "nsIProfile.h"
 #include "nsIMsgFolder.h"
 #include "nsImportStringBundle.h"
@@ -72,7 +71,6 @@
 
 #include "ImportDebug.h"
 
-static NS_DEFINE_IID(kIPOP3IncomingServerIID, NS_IPOP3INCOMINGSERVER_IID);
 static NS_DEFINE_CID(kMsgAccountCID, NS_MSGACCOUNT_CID);
 static NS_DEFINE_CID(kMsgIdentityCID, NS_MSGIDENTITY_CID);
 static NS_DEFINE_CID(kMsgBiffManagerCID, NS_MSGBIFFMANAGER_CID);
@@ -351,7 +349,7 @@ void nsImportGenericMail::GetDefaultLocation( void)
 	m_gotLocation = PR_TRUE;
 
 	nsIFileSpec *	pLoc = nsnull;
-	nsresult rv = m_pInterface->GetDefaultLocation( &pLoc, &m_found, &m_userVerify);
+	m_pInterface->GetDefaultLocation( &pLoc, &m_found, &m_userVerify);
 	if (!m_pSrcLocation)
 		m_pSrcLocation = pLoc;
 	else {
@@ -364,7 +362,7 @@ void nsImportGenericMail::GetDefaultMailboxes( void)
 	if (!m_pInterface || m_pMailboxes || !m_pSrcLocation)
 		return;
 	
-	nsresult rv = m_pInterface->FindMailboxes( m_pSrcLocation, &m_pMailboxes);
+	m_pInterface->FindMailboxes( m_pSrcLocation, &m_pMailboxes);
 }
 
 void nsImportGenericMail::GetDefaultDestination( void)
@@ -746,12 +744,12 @@ ImportMailThread( void *stuff)
 	nsString	error;
 
 	// Initialize the curFolder proxy object
-    NS_WITH_SERVICE( nsIProxyObjectManager, proxyMgr, kProxyObjectManagerCID, &rv);
+	NS_WITH_SERVICE( nsIProxyObjectManager, proxyMgr, kProxyObjectManagerCID, &rv);
 	if (NS_SUCCEEDED(rv)) {
 		rv = proxyMgr->GetProxyObject( NS_UI_THREAD_EVENTQ, nsIMsgFolder::GetIID(),
 										curFolder, PROXY_SYNC, getter_AddRefs( curProxy));
 
-		IMPORT_LOG1( "Proxy result for curFolder: 0x%lx\n", rv);
+		IMPORT_LOG1( "Proxy result for curFolder: 0x%lx\n", (long) rv);
 	}
 	else {
 		IMPORT_LOG0( "Unable to obtain proxy service to do import\n");
@@ -774,7 +772,7 @@ ImportMailThread( void *stuff)
 					rv = box->GetSize( &size);
 				rv = box->GetDepth( &newDepth);
 				if (newDepth > depth) {
-					char *	pStr = lastName.ToNewCString();
+					pStr = lastName.ToNewCString();
 					IMPORT_LOG1( "* Finding folder for child named: %s\n", pStr);
 					rv = curProxy->GetChildNamed( pStr, getter_AddRefs( subFolder));
 					nsCRT::free( pStr);
@@ -792,7 +790,7 @@ ImportMailThread( void *stuff)
 						break;
 					}
 
-					IMPORT_LOG1( "Created proxy for new subFolder: 0x%lx\n", rv);
+					IMPORT_LOG1( "Created proxy for new subFolder: 0x%lx\n", (long) rv);
 				}
 				else if (newDepth < depth) {
 					rv = NS_OK;
@@ -823,11 +821,11 @@ ImportMailThread( void *stuff)
 				exists = PR_FALSE;
 				rv = curProxy->ContainsChildNamed( pStr, &exists);
 				if (exists) {
-					char *pName = nsnull;
-					curProxy->GenerateUniqueSubfolderName( pStr, nsnull, &pName);
-					if (pName) {
+					char *pSubName = nsnull;
+					curProxy->GenerateUniqueSubfolderName( pStr, nsnull, &pSubName);
+					if (pSubName) {
 						nsCRT::free( pStr);
-						pStr = pName;
+						pStr = pSubName;
 					}
 				}
 				lastName = pStr;
@@ -836,10 +834,10 @@ ImportMailThread( void *stuff)
 				
 				rv = curProxy->CreateSubfolder( pStr);
 				
-				IMPORT_LOG1( "New folder created, rv: 0x%lx\n", rv);
+				IMPORT_LOG1( "New folder created, rv: 0x%lx\n", (long) rv);
 				if (NS_SUCCEEDED( rv)) {
 					rv = curProxy->GetChildNamed( pStr, getter_AddRefs( subFolder));
-					IMPORT_LOG1( "GetChildNamed for new folder returned rv: 0x%lx\n", rv);
+					IMPORT_LOG1( "GetChildNamed for new folder returned rv: 0x%lx\n", (long) rv);
 					if (NS_SUCCEEDED( rv)) {
 						newFolder = do_QueryInterface( subFolder);
 						if (newFolder) {
diff --git a/mozilla/mailnews/import/src/nsImportService.cpp b/mozilla/mailnews/import/src/nsImportService.cpp
index c18008d30f6..80d3d0435fb 100644
--- a/mozilla/mailnews/import/src/nsImportService.cpp
+++ b/mozilla/mailnews/import/src/nsImportService.cpp
@@ -724,6 +724,9 @@ void nsImportModuleList::AddModule( const nsCID& cid, const char *pSupports, con
 	m_pList[m_count]->SetDescription( pDesc);
 	
 	m_count++;
-	
-	IMPORT_LOG3( "* nsImportService registered import module: %S, %S, %s\n", pName, pDesc, pSupports);
+#ifdef IMPORT_DEBUG
+	nsCString 	name( pName);
+	nsCString	desc( pDesc);
+	IMPORT_LOG3( "* nsImportService registered import module: %s, %s, %s\n", (const char *)name, (const char *)desc, pSupports);
+#endif
 }
diff --git a/mozilla/mailnews/import/text/resources/Makefile.in b/mozilla/mailnews/import/text/resources/Makefile.in
index 1d58468949a..f15242d0c9e 100644
--- a/mozilla/mailnews/import/text/resources/Makefile.in
+++ b/mozilla/mailnews/import/text/resources/Makefile.in
@@ -26,7 +26,7 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-DIRS		= content locale
+DIRS		= locale
 
 include $(topsrcdir)/config/rules.mk
 
diff --git a/mozilla/mailnews/import/text/src/Makefile.in b/mozilla/mailnews/import/text/src/Makefile.in
index 6eb2ae10837..91ec579ff56 100644
--- a/mozilla/mailnews/import/text/src/Makefile.in
+++ b/mozilla/mailnews/import/text/src/Makefile.in
@@ -27,7 +27,7 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= impText
-#LIBRARY_NAME	= addrbook
+LIBRARY_NAME	= impText
 IS_COMPONENT	= 1
 
 
@@ -37,20 +37,11 @@ CPPSRCS		= 	nsTextFactory.cpp 				\
         		nsTextAddress.cpp 				\
 			$(NULL)
 			
-#EXPORTS		= nsAbBaseCID.h
-
-#SHARED_LIBRARY_LIBS = \
-#	$(DIST)/lib/libaddrbook_s.a \
-#	$(NULL)
 
 EXTRA_DSO_LDOPTS = \
-	$(MKSHLIB_FORCE_ALL) \
-	$(MKSHLIB_UNFORCE_ALL) \
 	-L$(DIST)/bin \
 	$(NSPR_LIBS) \
 	-lxpcom \
 	$(NULL)
 
 include $(topsrcdir)/config/rules.mk
-
-#$(LIBRARY) $(SHARED_LIBRARY): $(SHARED_LIBRARY_LIBS) Makefile
diff --git a/mozilla/mailnews/import/text/src/nsTextAddress.cpp b/mozilla/mailnews/import/text/src/nsTextAddress.cpp
index 5dd531f0d37..ae5cb81cd77 100644
--- a/mozilla/mailnews/import/text/src/nsTextAddress.cpp
+++ b/mozilla/mailnews/import/text/src/nsTextAddress.cpp
@@ -20,7 +20,7 @@
 #include "nsTextAddress.h"
 
 #include "nsIAddrDatabase.h"
-#include "nsABBaseCID.h"
+#include "nsAbBaseCID.h"
 #include "nsIAbCard.h"
 
 static NS_DEFINE_CID(kAbCardCID,			NS_ABCARD_CID);
@@ -496,7 +496,7 @@ nsresult nsTextAddress::ProcessLine( const char *pLine, PRInt32 len, nsString& e
 		}
 		else {
 			if (active) {
-				IMPORT_LOG1( "*** Error getting field map for index %ld\n", i);
+				IMPORT_LOG1( "*** Error getting field map for index %ld\n", (long) i);
 			}
 		}
 
@@ -1254,4 +1254,5 @@ void nsTextAddress::AddLdifColToDatabase(nsIMdbRow* newRow, char* typeSlot, char
 	default:
 	  break; // default
 	}
-}
\ No newline at end of file
+}
+
diff --git a/mozilla/mailnews/import/text/src/nsTextImport.cpp b/mozilla/mailnews/import/text/src/nsTextImport.cpp
index fe93cb34ebd..666eeee9c6d 100644
--- a/mozilla/mailnews/import/text/src/nsTextImport.cpp
+++ b/mozilla/mailnews/import/text/src/nsTextImport.cpp
@@ -618,7 +618,7 @@ NS_IMETHODIMP ImportAddressImpl::GetSampleData( PRInt32 index, PRBool *pFound, P
 		*pStr = nsCRT::strdup( str.GetUnicode());
 		*pFound = PR_TRUE;
 
-		IMPORT_LOG1( "Sample data: %S\n", str.GetUnicode());
+		/* IMPORT_LOG1( "Sample data: %S\n", str.GetUnicode()); */
 	}
 	else {
 		*pFound = PR_FALSE;