diff --git a/libs/rs/java/ModelViewer/src/com/android/modelviewer/transform_def.rsh b/libs/rs/java/ModelViewer/src/com/android/modelviewer/transform_def.rsh
index 7d1721cff0515..24a36c1db28e5 100644
--- a/libs/rs/java/ModelViewer/src/com/android/modelviewer/transform_def.rsh
+++ b/libs/rs/java/ModelViewer/src/com/android/modelviewer/transform_def.rsh
@@ -21,7 +21,7 @@
 #define TRANSFORM_ROTATE 2
 #define TRANSFORM_SCALE 3
 
-typedef struct __attribute__((packed, aligned(4))) {
+typedef struct __attribute__((packed, aligned(4))) SgTransform {
     rs_matrix4x4 globalMat;
     rs_matrix4x4 localMat;
 
diff --git a/libs/rs/java/tests/src/com/android/rs/test/vector_array.rs b/libs/rs/java/tests/src/com/android/rs/test/vector_array.rs
index a71a062c074ff..49e38c1898155 100644
--- a/libs/rs/java/tests/src/com/android/rs/test/vector_array.rs
+++ b/libs/rs/java/tests/src/com/android/rs/test/vector_array.rs
@@ -14,7 +14,7 @@
 
 #include "shared.rsh"
 
-typedef struct {
+typedef struct float3Struct{
     float3 arr[2];
 } float3Struct;