diff --git a/Android.mk b/Android.mk
index 008db5e4..71f37dfb 100644
--- a/Android.mk
+++ b/Android.mk
@@ -116,8 +116,7 @@ LOCAL_REQUIRED_MODULES := services
 
 LOCAL_SRC_FILES := \
     $(call all-java-files-under, $(cyanogenmod_sdk_src)) \
-    $(call all-Iaidl-files-under, $(cyanogenmod_sdk_src)) \
-    $(call all-Iaidl-files-under, $(cyanogenmod_sdk_internal_src))
+    $(call all-Iaidl-files-under, $(cyanogenmod_sdk_src))
 
 # Included aidl files from cyanogenmod.app namespace
 LOCAL_AIDL_INCLUDES := $(LOCAL_PATH)/sdk/src/java
diff --git a/cm/lib/main/java/org/cyanogenmod/platform/internal/CMStatusBarManagerService.java b/cm/lib/main/java/org/cyanogenmod/platform/internal/CMStatusBarManagerService.java
index d33a453b..6fe0d1a5 100644
--- a/cm/lib/main/java/org/cyanogenmod/platform/internal/CMStatusBarManagerService.java
+++ b/cm/lib/main/java/org/cyanogenmod/platform/internal/CMStatusBarManagerService.java
@@ -40,15 +40,16 @@ import android.util.Log;
 import android.util.Slog;
 
 import com.android.server.SystemService;
+
 import cyanogenmod.app.CMContextConstants;
 import cyanogenmod.app.CustomTile;
 import cyanogenmod.app.CustomTileListenerService;
 import cyanogenmod.app.StatusBarPanelCustomTile;
 import cyanogenmod.app.ICustomTileListener;
 import cyanogenmod.app.ICMStatusBarManager;
+import cyanogenmod.app.IStatusBarCustomTileHolder;
 
 import org.cyanogenmod.internal.statusbar.ExternalQuickSettingsRecord;
-import org.cyanogenmod.internal.statusbar.IStatusBarCustomTileHolder;
 
 import java.util.ArrayList;
 
diff --git a/sdk/src/java/cyanogenmod/app/CustomTileListenerService.java b/sdk/src/java/cyanogenmod/app/CustomTileListenerService.java
index 2c8036fd..5b35b0d5 100644
--- a/sdk/src/java/cyanogenmod/app/CustomTileListenerService.java
+++ b/sdk/src/java/cyanogenmod/app/CustomTileListenerService.java
@@ -27,10 +27,9 @@ import android.os.ServiceManager;
 import android.util.Log;
 
 import cyanogenmod.app.ICustomTileListener;
+import cyanogenmod.app.IStatusBarCustomTileHolder;
 import cyanogenmod.app.ICMStatusBarManager;
 
-import org.cyanogenmod.internal.statusbar.IStatusBarCustomTileHolder;
-
 /**
  * A service that receives calls from the system when new custom tiles are
  * posted or removed.
diff --git a/sdk/src/java/cyanogenmod/app/ICustomTileListener.aidl b/sdk/src/java/cyanogenmod/app/ICustomTileListener.aidl
index 9f21f520..f3dbfba3 100644
--- a/sdk/src/java/cyanogenmod/app/ICustomTileListener.aidl
+++ b/sdk/src/java/cyanogenmod/app/ICustomTileListener.aidl
@@ -16,10 +16,9 @@
 
 package cyanogenmod.app;
 
+import cyanogenmod.app.IStatusBarCustomTileHolder;
 import cyanogenmod.app.StatusBarPanelCustomTile;
 
-import org.cyanogenmod.internal.statusbar.IStatusBarCustomTileHolder;
-
 /** @hide */
 oneway interface ICustomTileListener
 {
diff --git a/sdk/src/java/org/cyanogenmod/internal/statusbar/IStatusBarCustomTileHolder.aidl b/sdk/src/java/cyanogenmod/app/IStatusBarCustomTileHolder.aidl
similarity index 95%
rename from sdk/src/java/org/cyanogenmod/internal/statusbar/IStatusBarCustomTileHolder.aidl
rename to sdk/src/java/cyanogenmod/app/IStatusBarCustomTileHolder.aidl
index 90e04de0..e8d48dd3 100644
--- a/sdk/src/java/org/cyanogenmod/internal/statusbar/IStatusBarCustomTileHolder.aidl
+++ b/sdk/src/java/cyanogenmod/app/IStatusBarCustomTileHolder.aidl
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.cyanogenmod.internal.statusbar;
+package cyanogenmod.app;
 
 import cyanogenmod.app.StatusBarPanelCustomTile;
 
@@ -22,4 +22,4 @@ import cyanogenmod.app.StatusBarPanelCustomTile;
 interface IStatusBarCustomTileHolder {
     /** Fetch the held StatusBarPanelCustomTile. This method should only be called once per Holder */
     StatusBarPanelCustomTile get();
-}
\ No newline at end of file
+}