diff --git a/Android.mk b/Android.mk
index f0c3d35..dc4838a 100644
--- a/Android.mk
+++ b/Android.mk
@@ -24,6 +24,7 @@
 # being included by google-framework
 LOCAL_STATIC_JAVA_LIBRARIES := google-framework
 LOCAL_STATIC_JAVA_LIBRARIES += gsf-client     # Google apps only: GSF client libraries
+LOCAL_STATIC_JAVA_LIBRARIES += google-common  # Google apps only: shared Google code
 
 LOCAL_PACKAGE_NAME := CalendarProvider
 
diff --git a/src/com/android/providers/calendar/CalendarProvider.java b/src/com/android/providers/calendar/CalendarProvider.java
index deff649..b2e29e7 100644
--- a/src/com/android/providers/calendar/CalendarProvider.java
+++ b/src/com/android/providers/calendar/CalendarProvider.java
@@ -73,9 +73,9 @@
 import com.google.android.collect.Sets;
 import com.google.android.gdata.client.AndroidGDataClient;
 import com.google.android.gdata.client.AndroidXmlParserFactory;
-import com.google.android.providers.AbstractGDataSyncAdapter;
-import com.google.android.providers.AbstractGDataSyncAdapter.GDataSyncData;
 import com.google.android.googlelogin.GoogleLoginServiceConstants;
+import com.google.android.gsf.AbstractGDataSyncAdapter;
+import com.google.android.gsf.AbstractGDataSyncAdapter.GDataSyncData;
 import com.google.wireless.gdata.calendar.client.CalendarClient;
 import com.google.wireless.gdata.calendar.parser.xml.XmlCalendarGDataParserFactory;
 
diff --git a/src/com/android/providers/calendar/CalendarSyncAdapter.java b/src/com/android/providers/calendar/CalendarSyncAdapter.java
index 95f0017..8e9a50a 100644
--- a/src/com/android/providers/calendar/CalendarSyncAdapter.java
+++ b/src/com/android/providers/calendar/CalendarSyncAdapter.java
@@ -41,6 +41,7 @@
 import android.provider.Calendar.Calendars;
 import android.provider.Calendar.Events;
 import com.google.android.gsf.SubscribedFeeds;
+import com.google.android.gsf.AbstractGDataSyncAdapter;
 
 import android.provider.SyncConstValue;
 import android.provider.Settings;
@@ -51,7 +52,6 @@
 import com.google.android.gdata.client.AndroidGDataClient;
 import com.google.android.gdata.client.AndroidXmlParserFactory;
 import com.google.android.googlelogin.GoogleLoginServiceConstants;
-import com.google.android.providers.AbstractGDataSyncAdapter;
 import com.google.wireless.gdata.calendar.client.CalendarClient;
 import com.google.wireless.gdata.calendar.data.CalendarEntry;
 import com.google.wireless.gdata.calendar.data.CalendarsFeed;