diff --git a/libs/rs/RenderScript.cpp b/libs/rs/RenderScript.cpp
index 0b4205559959a..217b92183e09d 100644
--- a/libs/rs/RenderScript.cpp
+++ b/libs/rs/RenderScript.cpp
@@ -21,6 +21,7 @@
 #include <string.h>
 
 #include "RenderScript.h"
+#include "rs.h"
 
 bool RenderScript::gInitialized = false;
 pthread_mutex_t RenderScript::gInitMutex = PTHREAD_MUTEX_INITIALIZER;
diff --git a/libs/rs/RenderScript.h b/libs/rs/RenderScript.h
index 0eb6a6d6c82f1..5ad76e2cb25ee 100644
--- a/libs/rs/RenderScript.h
+++ b/libs/rs/RenderScript.h
@@ -22,7 +22,7 @@
 #include <utils/String8.h>
 #include <utils/Vector.h>
 
-#include "rs.h"
+#include "rsDefines.h"
 
 class Element;
 class Type;
diff --git a/libs/rs/rsComponent.h b/libs/rs/rsComponent.h
index 8629d0d9d6b9a..a2e8c0f92a356 100644
--- a/libs/rs/rsComponent.h
+++ b/libs/rs/rsComponent.h
@@ -18,6 +18,7 @@
 #define ANDROID_COMPONENT_H
 
 #include "rsUtils.h"
+#include "rsDefines.h"
 
 // ---------------------------------------------------------------------------
 namespace android {
diff --git a/libs/rs/rsContext.cpp b/libs/rs/rsContext.cpp
index 0f3cea78c3088..748b72a0470d7 100644
--- a/libs/rs/rsContext.cpp
+++ b/libs/rs/rsContext.cpp
@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 
+#include "rs.h"
 #include "rsDevice.h"
 #include "rsContext.h"
 #include "rsThreadIO.h"
diff --git a/libs/rs/rsElement.h b/libs/rs/rsElement.h
index 4b6b46016e3fe..b86d3bc9104ee 100644
--- a/libs/rs/rsElement.h
+++ b/libs/rs/rsElement.h
@@ -19,6 +19,7 @@
 
 #include "rsComponent.h"
 #include "rsUtils.h"
+#include "rsDefines.h"
 #include "rsObjectBase.h"
 
 // ---------------------------------------------------------------------------
diff --git a/libs/rs/rsFileA3D.cpp b/libs/rs/rsFileA3D.cpp
index ac658c8e53ff8..173b9a52c005f 100644
--- a/libs/rs/rsFileA3D.cpp
+++ b/libs/rs/rsFileA3D.cpp
@@ -20,7 +20,7 @@
 
 #include "rsMesh.h"
 #include "rsAnimation.h"
-
+#include "rs.h"
 
 using namespace android;
 using namespace android::renderscript;
diff --git a/libs/rs/rsFileA3D.h b/libs/rs/rsFileA3D.h
index baf81de5083a3..08062c63c4da7 100644
--- a/libs/rs/rsFileA3D.h
+++ b/libs/rs/rsFileA3D.h
@@ -17,7 +17,6 @@
 #ifndef ANDROID_RS_FILE_A3D_H
 #define ANDROID_RS_FILE_A3D_H
 
-#include "rs.h"
 #include "rsMesh.h"
 
 #include <androidfw/Asset.h>
diff --git a/libs/rs/rsFont.cpp b/libs/rs/rsFont.cpp
index c4276cfe82617..2bf9a7501dae1 100644
--- a/libs/rs/rsFont.cpp
+++ b/libs/rs/rsFont.cpp
@@ -16,7 +16,7 @@
  */
 
 #include "rsContext.h"
-
+#include "rs.h"
 #include "rsFont.h"
 #include "rsProgramFragment.h"
 #include <cutils/properties.h>
diff --git a/libs/rs/rsFont.h b/libs/rs/rsFont.h
index 88c4795340969..2bd30b78a199f 100644
--- a/libs/rs/rsFont.h
+++ b/libs/rs/rsFont.h
@@ -17,7 +17,6 @@
 #ifndef ANDROID_RS_FONT_H
 #define ANDROID_RS_FONT_H
 
-#include "rs.h"
 #include "rsStream.h"
 #include <utils/String8.h>
 #include <utils/Vector.h>
diff --git a/libs/rs/rsMesh.cpp b/libs/rs/rsMesh.cpp
index 67c7299251353..f9dbc33c96f5a 100644
--- a/libs/rs/rsMesh.cpp
+++ b/libs/rs/rsMesh.cpp
@@ -15,6 +15,7 @@
  */
 
 #include "rsContext.h"
+#include "rs.h"
 
 using namespace android;
 using namespace android::renderscript;
diff --git a/libs/rs/rsMesh.h b/libs/rs/rsMesh.h
index 8eea4279e3f72..7ca63cf22e866 100644
--- a/libs/rs/rsMesh.h
+++ b/libs/rs/rsMesh.h
@@ -18,7 +18,7 @@
 #define ANDROID_RS_MESH_H
 
 
-#include "rs.h"
+#include "rsObjectBase.h"
 
 // ---------------------------------------------------------------------------
 namespace android {
diff --git a/libs/rs/rsObjectBase.h b/libs/rs/rsObjectBase.h
index d9f5f3ba12493..586da191dabcd 100644
--- a/libs/rs/rsObjectBase.h
+++ b/libs/rs/rsObjectBase.h
@@ -18,6 +18,7 @@
 #define ANDROID_RS_OBJECT_BASE_H
 
 #include "rsUtils.h"
+#include "rsDefines.h"
 
 #define RS_OBJECT_DEBUG 0
 
diff --git a/libs/rs/rsSampler.cpp b/libs/rs/rsSampler.cpp
index 5fc64a42cd1fd..c7180bd9da480 100644
--- a/libs/rs/rsSampler.cpp
+++ b/libs/rs/rsSampler.cpp
@@ -16,7 +16,7 @@
 
 #include "rsContext.h"
 #include "rsSampler.h"
-
+#include "rs.h"
 
 using namespace android;
 using namespace android::renderscript;
diff --git a/libs/rs/rsSampler.h b/libs/rs/rsSampler.h
index 013e4ca32370d..dea4cb676f695 100644
--- a/libs/rs/rsSampler.h
+++ b/libs/rs/rsSampler.h
@@ -18,7 +18,6 @@
 #define ANDROID_RS_SAMPLER_H
 
 #include "rsAllocation.h"
-#include "rs.h"
 
 // ---------------------------------------------------------------------------
 namespace android {
diff --git a/libs/rs/rsUtils.h b/libs/rs/rsUtils.h
index a9a992a773ec8..cbbae6c72498e 100644
--- a/libs/rs/rsUtils.h
+++ b/libs/rs/rsUtils.h
@@ -34,8 +34,6 @@
 
 #include <math.h>
 
-#include "rs.h"
-
 namespace android {
 namespace renderscript {