diff --git a/Android.mk b/Android.mk
index fb4008d..7485027 100644
--- a/Android.mk
+++ b/Android.mk
@@ -4,7 +4,8 @@ include $(CLEAR_VARS)
 
 LOCAL_MODULE := GmsApi
 LOCAL_SRC_FILES := $(call all-java-files-under, play-services-api/src/main/java)
-LOCAL_SRC_FILES := $(call all-Iaidl-files-under, play-services-api/src/main/aidl)
+LOCAL_SRC_FILES += $(call all-Iaidl-files-under, play-services-api/src/main/aidl)
+LOCAL_AIDL_INCLUDES := $(LOCAL_PATH)/play-services-api/src/main/aidl
 LOCAL_STATIC_JAVA_LIBRARIES := SafeParcel
 
 include $(BUILD_STATIC_JAVA_LIBRARY)
diff --git a/play-services-api/src/main/aidl/com/google/android/auth/IAuthManagerService.aidl b/play-services-api/src/main/aidl/com/google/android/auth/IAuthManagerService.aidl
index 94ced65..ac46a32 100644
--- a/play-services-api/src/main/aidl/com/google/android/auth/IAuthManagerService.aidl
+++ b/play-services-api/src/main/aidl/com/google/android/auth/IAuthManagerService.aidl
@@ -1,5 +1,7 @@
 package com.google.android.auth;
 
+import android.os.Bundle;
+
 import com.google.android.gms.auth.AccountChangeEventsResponse;
 import com.google.android.gms.auth.AccountChangeEventsRequest;
 
diff --git a/play-services-api/src/main/aidl/com/google/android/gms/common/internal/IGmsCallbacks.aidl b/play-services-api/src/main/aidl/com/google/android/gms/common/internal/IGmsCallbacks.aidl
index 9a36b0e..b021028 100644
--- a/play-services-api/src/main/aidl/com/google/android/gms/common/internal/IGmsCallbacks.aidl
+++ b/play-services-api/src/main/aidl/com/google/android/gms/common/internal/IGmsCallbacks.aidl
@@ -1,5 +1,7 @@
 package com.google.android.gms.common.internal;
 
+import android.os.Bundle;
+
 interface IGmsCallbacks {
     void onPostInitComplete(int statusCode, IBinder binder, in Bundle params);
 }
diff --git a/play-services-api/src/main/aidl/com/google/android/gms/common/internal/IGmsServiceBroker.aidl b/play-services-api/src/main/aidl/com/google/android/gms/common/internal/IGmsServiceBroker.aidl
index 318c4da..185b394 100644
--- a/play-services-api/src/main/aidl/com/google/android/gms/common/internal/IGmsServiceBroker.aidl
+++ b/play-services-api/src/main/aidl/com/google/android/gms/common/internal/IGmsServiceBroker.aidl
@@ -1,5 +1,7 @@
 package com.google.android.gms.common.internal;
 
+import android.os.Bundle;
+
 import com.google.android.gms.common.internal.IGmsCallbacks;
 
 interface IGmsServiceBroker {
diff --git a/play-services-api/src/main/aidl/com/google/android/gms/location/internal/IGoogleLocationManagerService.aidl b/play-services-api/src/main/aidl/com/google/android/gms/location/internal/IGoogleLocationManagerService.aidl
index a60350f..e2fb3ac 100644
--- a/play-services-api/src/main/aidl/com/google/android/gms/location/internal/IGoogleLocationManagerService.aidl
+++ b/play-services-api/src/main/aidl/com/google/android/gms/location/internal/IGoogleLocationManagerService.aidl
@@ -1,5 +1,9 @@
 package com.google.android.gms.location.internal;
 
+import android.app.PendingIntent;
+import android.location.Location;
+import android.os.Bundle;
+
 import com.google.android.gms.location.places.AutocompleteFilter;
 import com.google.android.gms.location.places.internal.IPlacesCallbacks;
 import com.google.android.gms.location.internal.LocationRequestInternal;
diff --git a/play-services-api/src/main/aidl/com/google/android/gms/maps/internal/IGoogleMapDelegate.aidl b/play-services-api/src/main/aidl/com/google/android/gms/maps/internal/IGoogleMapDelegate.aidl
index ac474c3..ae5e402 100644
--- a/play-services-api/src/main/aidl/com/google/android/gms/maps/internal/IGoogleMapDelegate.aidl
+++ b/play-services-api/src/main/aidl/com/google/android/gms/maps/internal/IGoogleMapDelegate.aidl
@@ -1,5 +1,7 @@
 package com.google.android.gms.maps.internal;
 
+import android.location.Location;
+
 import com.google.android.gms.dynamic.IObjectWrapper;
 import com.google.android.gms.maps.model.CameraPosition;
 import com.google.android.gms.maps.internal.ICancelableCallback;
diff --git a/play-services-api/src/main/aidl/com/google/android/gms/maps/internal/IMapFragmentDelegate.aidl b/play-services-api/src/main/aidl/com/google/android/gms/maps/internal/IMapFragmentDelegate.aidl
index 966c4e4..ebfee0d 100644
--- a/play-services-api/src/main/aidl/com/google/android/gms/maps/internal/IMapFragmentDelegate.aidl
+++ b/play-services-api/src/main/aidl/com/google/android/gms/maps/internal/IMapFragmentDelegate.aidl
@@ -1,5 +1,7 @@
 package com.google.android.gms.maps.internal;
 
+import android.os.Bundle;
+
 import com.google.android.gms.maps.internal.IGoogleMapDelegate;
 import com.google.android.gms.maps.GoogleMapOptions;
 import com.google.android.gms.dynamic.IObjectWrapper;
diff --git a/play-services-api/src/main/aidl/com/google/android/gms/maps/internal/IMapViewDelegate.aidl b/play-services-api/src/main/aidl/com/google/android/gms/maps/internal/IMapViewDelegate.aidl
index 820e27b..2efb564 100644
--- a/play-services-api/src/main/aidl/com/google/android/gms/maps/internal/IMapViewDelegate.aidl
+++ b/play-services-api/src/main/aidl/com/google/android/gms/maps/internal/IMapViewDelegate.aidl
@@ -1,5 +1,7 @@
 package com.google.android.gms.maps.internal;
 
+import android.os.Bundle;
+
 import com.google.android.gms.maps.internal.IGoogleMapDelegate;
 import com.google.android.gms.dynamic.IObjectWrapper;
 
diff --git a/play-services-api/src/main/aidl/com/google/android/gms/people/internal/IPeopleCallbacks.aidl b/play-services-api/src/main/aidl/com/google/android/gms/people/internal/IPeopleCallbacks.aidl
index 8738a9e..66b35e4 100644
--- a/play-services-api/src/main/aidl/com/google/android/gms/people/internal/IPeopleCallbacks.aidl
+++ b/play-services-api/src/main/aidl/com/google/android/gms/people/internal/IPeopleCallbacks.aidl
@@ -1,5 +1,7 @@
 package com.google.android.gms.people.internal;
 
+import android.os.Bundle;
+
 import com.google.android.gms.common.data.DataHolder;
 
 interface IPeopleCallbacks {
diff --git a/play-services-api/src/main/aidl/com/google/android/gms/people/internal/IPeopleService.aidl b/play-services-api/src/main/aidl/com/google/android/gms/people/internal/IPeopleService.aidl
index e399cd0..d50aee4 100644
--- a/play-services-api/src/main/aidl/com/google/android/gms/people/internal/IPeopleService.aidl
+++ b/play-services-api/src/main/aidl/com/google/android/gms/people/internal/IPeopleService.aidl
@@ -1,5 +1,7 @@
 package com.google.android.gms.people.internal;
 
+import android.os.Bundle;
+
 import com.google.android.gms.people.internal.IPeopleCallbacks;
 import com.google.android.gms.common.server.FavaDiagnosticsEntity;
 import com.google.android.gms.common.internal.ICancelToken;