diff --git a/vmvx_ukernel/CMakeLists.txt b/vmvx_ukernel/CMakeLists.txt
index 67e0e6c..4272c4b 100644
--- a/vmvx_ukernel/CMakeLists.txt
+++ b/vmvx_ukernel/CMakeLists.txt
@@ -5,9 +5,6 @@
     ukernel
   HDRS
     "${IREE_RUNTIME_SOURCE_DIR}/builtins/ukernel/api.h"
-    "${IREE_RUNTIME_SOURCE_DIR}/builtins/ukernel/mmt4d_tile.h"
-    "${IREE_RUNTIME_SOURCE_DIR}/builtins/ukernel/pack_tile.h"
-    "${IREE_RUNTIME_SOURCE_DIR}/builtins/ukernel/unpack_tile.h"
   SRCS
     "elementwise.c"
     "elementwise_impl.c.inc"
@@ -19,7 +16,7 @@
     "${IREE_RUNTIME_SOURCE_DIR}/builtins/ukernel/unpack.c"
     "${IREE_RUNTIME_SOURCE_DIR}/builtins/ukernel/unpack_tile.c"
   DEPS
-    iree::builtins::ukernel::headers
+    iree::builtins::ukernel::internal_headers
   PUBLIC
 )
 
diff --git a/vmvx_ukernel/mmt4d_tile.c b/vmvx_ukernel/mmt4d_tile.c
index a591c66..05730fb 100644
--- a/vmvx_ukernel/mmt4d_tile.c
+++ b/vmvx_ukernel/mmt4d_tile.c
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-#include "iree/builtins/ukernel/mmt4d_tile.h"
-
 #include <riscv_vector.h>
 #include <string.h>
 
+#include "iree/builtins/ukernel/mmt4d_internal.h"
+
 // Calculate the dot product of two int8 vectors using RVV
 static iree_uk_int32_t dot_product_rvv(const iree_uk_int8_t* u,
                                        const iree_uk_int8_t* w, int n) {
diff --git a/vmvx_ukernel/query_tile_sizes.c b/vmvx_ukernel/query_tile_sizes.c
index 4bab96e..e3c9222 100644
--- a/vmvx_ukernel/query_tile_sizes.c
+++ b/vmvx_ukernel/query_tile_sizes.c
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "iree/builtins/ukernel/query_tile_sizes.h"
+#include "iree/builtins/ukernel/query_tile_sizes_internal.h"
 
 static bool iree_uk_query_tile_sizes_operation_is_matmul(
     iree_uk_uint32_t flags) {