diff -Naur addrbook_old/nsIAbDirectory.h addrbook_new/nsIAbDirectory.h
--- addrbook_old/nsIAbDirectory.h	2008-04-08 18:34:40.000000000 +0200
+++ addrbook_new/nsIAbDirectory.h	2008-04-07 19:20:24.000000000 +0200
@@ -22,7 +22,7 @@
 #ifndef NS_NO_VTABLE
 #define NS_NO_VTABLE
 #endif
-#include "nsFileSpec.h"
+#include "nsIFile.h"
 #include "nsDirPrefs.h"
 
 /* starting interface:    nsIAbDirectoryProperties */
diff -Naur addrbook_old/nsIAddrDatabase.h addrbook_new/nsIAddrDatabase.h
--- addrbook_old/nsIAddrDatabase.h	2008-04-08 18:38:36.000000000 +0200
+++ addrbook_new/nsIAddrDatabase.h	2008-04-07 19:21:08.000000000 +0200
@@ -189,8 +189,8 @@
   NS_DEFINE_STATIC_IID_ACCESSOR(NS_IADDRDATABASE_IID)
 
   /* [noscript] attribute nsFileSpec dbPath; */
-  NS_IMETHOD GetDbPath(nsFileSpec * *aDbPath) = 0;
-  NS_IMETHOD SetDbPath(nsFileSpec * aDbPath) = 0;
+  NS_IMETHOD GetDbPath(nsIFile * *aDbPath) = 0;
+  NS_IMETHOD SetDbPath(nsIFile * aDbPath) = 0;
 
   /* nsIAddrDatabase open (in nsIFile dbFile, in boolean create, in boolean upgrading); */
   NS_IMETHOD Open(nsIFile *dbFile, PRBool create, PRBool upgrading, nsIAddrDatabase **_retval) = 0;
@@ -198,8 +198,8 @@
   /* void close (in boolean forceCommit); */
   NS_IMETHOD Close(PRBool forceCommit) = 0;
 
-  /* [noscript] void openMDB (in nsFileSpec dbName, in boolean create); */
-  NS_IMETHOD OpenMDB(nsFileSpec * dbName, PRBool create) = 0;
+  /* [noscript] void openMDB (in nsFile dbName, in boolean create); */
+  NS_IMETHOD OpenMDB(nsIFile * dbName, PRBool create) = 0;
 
   /* void closeMDB (in boolean commit); */
   NS_IMETHOD CloseMDB(PRBool commit) = 0;