diff --git a/src/Bullet3OpenCL/NarrowphaseCollision/kernels/mprKernels.h b/src/Bullet3OpenCL/NarrowphaseCollision/kernels/mprKernels.h
index 3704a8914..7ed4b382c 100644
--- a/src/Bullet3OpenCL/NarrowphaseCollision/kernels/mprKernels.h
+++ b/src/Bullet3OpenCL/NarrowphaseCollision/kernels/mprKernels.h
@@ -404,33 +404,17 @@ static const char* mprKernelsCL= \
 "		int	m_compoundBvhIndex;\n"
 "	};\n"
 "	int m_shapeType;\n"
-"	union\n"
-"	{\n"
-"		int m_shapeIndex;\n"
-"		float m_height;\n"
-"	};\n"
+"	int m_shapeIndex;\n"
 "};\n"
 "typedef struct b3GpuChildShape b3GpuChildShape_t;\n"
 "struct b3GpuChildShape\n"
 "{\n"
 "	b3Float4	m_childPosition;\n"
 "	b3Quat		m_childOrientation;\n"
-"	union\n"
-"	{\n"
-"		int			m_shapeIndex;//used for SHAPE_COMPOUND_OF_CONVEX_HULLS\n"
-"		int			m_capsuleAxis;\n"
-"	};\n"
-"	union \n"
-"	{\n"
-"		float		m_radius;//used for childshape of SHAPE_COMPOUND_OF_SPHERES or SHAPE_COMPOUND_OF_CAPSULES\n"
-"		int			m_numChildShapes;//used for compound shape\n"
-"	};\n"
-"	union \n"
-"	{\n"
-"		float		m_height;//used for childshape of SHAPE_COMPOUND_OF_CAPSULES\n"
-"		int	m_collidableShapeIndex;\n"
-"	};\n"
-"	int			m_shapeType;\n"
+"	int m_shapeIndex;\n"
+"	int m_unused0;\n"
+"	int m_unused1;\n"
+"	int m_unused2;\n"
 "};\n"
 "struct b3CompoundOverlappingPair\n"
 "{\n"
diff --git a/src/Bullet3OpenCL/NarrowphaseCollision/kernels/satClipHullContacts.h b/src/Bullet3OpenCL/NarrowphaseCollision/kernels/satClipHullContacts.h
index f2acee16d..f0ecfc785 100644
--- a/src/Bullet3OpenCL/NarrowphaseCollision/kernels/satClipHullContacts.h
+++ b/src/Bullet3OpenCL/NarrowphaseCollision/kernels/satClipHullContacts.h
@@ -281,33 +281,17 @@ static const char* satClipKernelsCL= \
 "		int	m_compoundBvhIndex;\n"
 "	};\n"
 "	int m_shapeType;\n"
-"	union\n"
-"	{\n"
-"		int m_shapeIndex;\n"
-"		float m_height;\n"
-"	};\n"
+"	int m_shapeIndex;\n"
 "};\n"
 "typedef struct b3GpuChildShape b3GpuChildShape_t;\n"
 "struct b3GpuChildShape\n"
 "{\n"
 "	b3Float4	m_childPosition;\n"
 "	b3Quat		m_childOrientation;\n"
-"	union\n"
-"	{\n"
-"		int			m_shapeIndex;//used for SHAPE_COMPOUND_OF_CONVEX_HULLS\n"
-"		int			m_capsuleAxis;\n"
-"	};\n"
-"	union \n"
-"	{\n"
-"		float		m_radius;//used for childshape of SHAPE_COMPOUND_OF_SPHERES or SHAPE_COMPOUND_OF_CAPSULES\n"
-"		int			m_numChildShapes;//used for compound shape\n"
-"	};\n"
-"	union \n"
-"	{\n"
-"		float		m_height;//used for childshape of SHAPE_COMPOUND_OF_CAPSULES\n"
-"		int	m_collidableShapeIndex;\n"
-"	};\n"
-"	int			m_shapeType;\n"
+"	int m_shapeIndex;\n"
+"	int m_unused0;\n"
+"	int m_unused1;\n"
+"	int m_unused2;\n"
 "};\n"
 "struct b3CompoundOverlappingPair\n"
 "{\n"