Move rs.h includes to source files.
Change-Id: Ic49e3fa5580c67f35a21f95872794ea03dd114b6
diff --git a/cpp/Allocation.cpp b/cpp/Allocation.cpp
index 9f3ce20..d2d81c9 100644
--- a/cpp/Allocation.cpp
+++ b/cpp/Allocation.cpp
@@ -15,6 +15,7 @@
*/
#include "RenderScript.h"
+#include <rs.h>
using namespace android;
using namespace RSC;
diff --git a/cpp/BaseObj.cpp b/cpp/BaseObj.cpp
index bb92bce..d0102d0 100644
--- a/cpp/BaseObj.cpp
+++ b/cpp/BaseObj.cpp
@@ -17,6 +17,7 @@
#define LOG_TAG "libRS_cpp"
#include "RenderScript.h"
+#include <rs.h>
using namespace android;
using namespace RSC;
diff --git a/cpp/Element.cpp b/cpp/Element.cpp
index 198aac8..f3e83d0 100644
--- a/cpp/Element.cpp
+++ b/cpp/Element.cpp
@@ -18,6 +18,7 @@
#include <string.h>
#include "RenderScript.h"
+#include <rs.h>
using namespace android;
using namespace RSC;
diff --git a/cpp/Script.cpp b/cpp/Script.cpp
index 0f87adb..ee03aaf 100644
--- a/cpp/Script.cpp
+++ b/cpp/Script.cpp
@@ -18,6 +18,7 @@
#include <malloc.h>
#include "RenderScript.h"
+#include <rs.h>
using namespace android;
using namespace RSC;
diff --git a/cpp/ScriptC.cpp b/cpp/ScriptC.cpp
index bc7ca0e..95bd9a4 100644
--- a/cpp/ScriptC.cpp
+++ b/cpp/ScriptC.cpp
@@ -18,6 +18,7 @@
#include <malloc.h>
#include "RenderScript.h"
+#include <rs.h>
using namespace android;
using namespace RSC;
diff --git a/cpp/ScriptIntrinsics.cpp b/cpp/ScriptIntrinsics.cpp
index 1284736..4a39d0e 100644
--- a/cpp/ScriptIntrinsics.cpp
+++ b/cpp/ScriptIntrinsics.cpp
@@ -18,6 +18,7 @@
#include <malloc.h>
#include "RenderScript.h"
+#include <rs.h>
#include "rsDefines.h"
using namespace android;
diff --git a/cpp/Type.cpp b/cpp/Type.cpp
index 0b473c4..675f66e 100644
--- a/cpp/Type.cpp
+++ b/cpp/Type.cpp
@@ -20,6 +20,7 @@
#include <malloc.h>
#include <string.h>
+#include <rs.h>
#include "RenderScript.h"
using namespace android;
diff --git a/cpp/rsCppStructs.h b/cpp/rsCppStructs.h
index f5bfd0c..67df202 100644
--- a/cpp/rsCppStructs.h
+++ b/cpp/rsCppStructs.h
@@ -21,8 +21,6 @@
#include <utils/Vector.h>
#include "utils/RefBase.h"
-#include <rs.h>
-
// Every row in an RS allocation is guaranteed to be aligned by this amount
// Every row in a user-backed allocation must be aligned by this amount
#define RS_CPU_ALLOCATION_ALIGNMENT 16