Index: mozilla/browser/components/places/src/nsAnnotationService.cpp
===================================================================
RCS file: /cvsroot/mozilla/browser/components/places/src/nsAnnotationService.cpp,v
retrieving revision 1.13
diff -pU0 -r1.13 mozilla/browser/components/places/src/nsAnnotationService.cpp
--- mozilla/browser/components/places/src/nsAnnotationService.cpp
+++ mozilla/browser/components/places/src/nsAnnotationService.cpp
@@ -60,3 +59,0 @@ const PRInt32 nsAnnotationService::kAnno
-static NS_DEFINE_CID(kmozStorageServiceCID, MOZ_STORAGE_SERVICE_CID);
-static NS_DEFINE_CID(kmozStorageConnectionCID, MOZ_STORAGE_CONNECTION_CID);
-
Index: mozilla/storage/test/storage1.cpp
===================================================================
RCS file: /cvsroot/mozilla/storage/test/storage1.cpp,v
retrieving revision 1.7
diff -pU0 -r1.7 mozilla/storage/test/storage1.cpp
--- mozilla/storage/test/storage1.cpp
+++ mozilla/storage/test/storage1.cpp
@@ -21,3 +20,0 @@
-static NS_DEFINE_CID(kmozStorageServiceCID, MOZ_STORAGE_SERVICE_CID);
-static NS_DEFINE_CID(kmozStorageConnectionCID, MOZ_STORAGE_CONNECTION_CID);
-
@@ -65 +62 @@ main (int argc, char **argv)
-    dbSrv = do_GetService(kmozStorageServiceCID, &rv);
+    dbSrv = do_GetService(MOZ_STORAGE_SERVICE_CONTRACTID, &rv);