diff --git a/libs/rs/java/Fountain/src/com/android/fountain/fountain.rs b/libs/rs/java/Fountain/src/com/android/fountain/fountain.rs
index 4417197f5fdd1..34bea2fcf532e 100644
--- a/libs/rs/java/Fountain/src/com/android/fountain/fountain.rs
+++ b/libs/rs/java/Fountain/src/com/android/fountain/fountain.rs
@@ -3,8 +3,6 @@
 
 #pragma rs java_package_name(com.android.fountain)
 
-#include "rs_types.rsh"
-#include "rs_math.rsh"
 #include "rs_graphics.rsh"
 
 static int newPart = 0;
diff --git a/libs/rs/java/ImageProcessing/src/com/android/rs/image/horizontal_blur.rs b/libs/rs/java/ImageProcessing/src/com/android/rs/image/horizontal_blur.rs
index b58039311e653..12180c650ae4c 100644
--- a/libs/rs/java/ImageProcessing/src/com/android/rs/image/horizontal_blur.rs
+++ b/libs/rs/java/ImageProcessing/src/com/android/rs/image/horizontal_blur.rs
@@ -1,8 +1,5 @@
 #pragma version(1)
 
-#include "rs_types.rsh"
-#include "rs_math.rsh"
-
 #include "ip.rsh"
 
 void root(const void *v_in, void *v_out, const void *usrData, uint32_t x, uint32_t y) {
diff --git a/libs/rs/java/ImageProcessing/src/com/android/rs/image/levels.rs b/libs/rs/java/ImageProcessing/src/com/android/rs/image/levels.rs
index b0db8a37f68f3..86ec56d2d4ca8 100644
--- a/libs/rs/java/ImageProcessing/src/com/android/rs/image/levels.rs
+++ b/libs/rs/java/ImageProcessing/src/com/android/rs/image/levels.rs
@@ -1,8 +1,5 @@
 #pragma version(1)
 
-#include "rs_types.rsh"
-#include "rs_math.rsh"
-
 #include "ip.rsh"
 
 
diff --git a/libs/rs/java/ImageProcessing/src/com/android/rs/image/threshold.rs b/libs/rs/java/ImageProcessing/src/com/android/rs/image/threshold.rs
index 3cd43c7aa90f9..5dcd372bfaa5d 100644
--- a/libs/rs/java/ImageProcessing/src/com/android/rs/image/threshold.rs
+++ b/libs/rs/java/ImageProcessing/src/com/android/rs/image/threshold.rs
@@ -1,8 +1,5 @@
 #pragma version(1)
 
-#include "rs_types.rsh"
-#include "rs_math.rsh"
-
 #include "ip.rsh"
 
 int height;
diff --git a/libs/rs/java/ImageProcessing/src/com/android/rs/image/vertical_blur.rs b/libs/rs/java/ImageProcessing/src/com/android/rs/image/vertical_blur.rs
index 23387eff1753b..394d36a587bba 100644
--- a/libs/rs/java/ImageProcessing/src/com/android/rs/image/vertical_blur.rs
+++ b/libs/rs/java/ImageProcessing/src/com/android/rs/image/vertical_blur.rs
@@ -1,8 +1,5 @@
 #pragma version(1)
 
-#include "rs_types.rsh"
-#include "rs_math.rsh"
-
 #include "ip.rsh"
 
 void root(const void *v_in, void *v_out, const void *usrData, uint32_t x, uint32_t y) {
diff --git a/libs/rs/java/ModelViewer/src/com/android/modelviewer/modelviewer.rs b/libs/rs/java/ModelViewer/src/com/android/modelviewer/modelviewer.rs
index 8da7506f14da3..41594eb2a3e92 100644
--- a/libs/rs/java/ModelViewer/src/com/android/modelviewer/modelviewer.rs
+++ b/libs/rs/java/ModelViewer/src/com/android/modelviewer/modelviewer.rs
@@ -16,8 +16,6 @@
 
 #pragma rs java_package_name(com.android.modelviewer)
 
-#include "rs_types.rsh"
-#include "rs_math.rsh"
 #include "rs_graphics.rsh"
 
 rs_program_vertex gPVBackground;