Moving aside the emitc shim file for now until we update it.
diff --git a/iree/compiler/Dialect/VM/Target/C/CModuleTarget.cpp b/iree/compiler/Dialect/VM/Target/C/CModuleTarget.cpp
index dbf055c..b58c9cf 100644
--- a/iree/compiler/Dialect/VM/Target/C/CModuleTarget.cpp
+++ b/iree/compiler/Dialect/VM/Target/C/CModuleTarget.cpp
@@ -654,7 +654,7 @@
 
   printInclude("iree/vm/api.h");
   printInclude("iree/vm/ops.h");
-  printInclude("iree/vm/shims.h");
+  printInclude("iree/vm/shims_emitc.h");
   output << "\n";
 
   printModuleComment(moduleOp, output);
diff --git a/iree/samples/emitc_modules/CMakeLists.txt b/iree/samples/emitc_modules/CMakeLists.txt
index 38c20f6..6e6d9cf 100644
--- a/iree/samples/emitc_modules/CMakeLists.txt
+++ b/iree/samples/emitc_modules/CMakeLists.txt
@@ -36,6 +36,6 @@
       iree::vm
       iree::vm::cc
       iree::vm::ops
-      iree::vm::shims
+      iree::vm::shims_emitc
   )
 endif()
diff --git a/iree/vm/BUILD b/iree/vm/BUILD
index 4330652..04b5896 100644
--- a/iree/vm/BUILD
+++ b/iree/vm/BUILD
@@ -312,8 +312,8 @@
 )
 
 cc_library(
-    name = "shims",
+    name = "shims_emitc",
     hdrs = [
-        "shims.h",
+        "shims_emitc.h",
     ],
 )
diff --git a/iree/vm/CMakeLists.txt b/iree/vm/CMakeLists.txt
index c356740..87cab30 100644
--- a/iree/vm/CMakeLists.txt
+++ b/iree/vm/CMakeLists.txt
@@ -272,9 +272,9 @@
 
 iree_cc_library(
   NAME
-    shims
+    shims_emitc
   HDRS
-    "shims.h"
+    "shims_emitc.h"
   PUBLIC
 )
 
diff --git a/iree/vm/shims.h b/iree/vm/shims_emitc.h
similarity index 96%
rename from iree/vm/shims.h
rename to iree/vm/shims_emitc.h
index 1a49c77..3c4de4e 100644
--- a/iree/vm/shims.h
+++ b/iree/vm/shims_emitc.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef IREE_VM_TEST_EMITC_SHIMS_H_
-#define IREE_VM_TEST_EMITC_SHIMS_H_
+#ifndef IREE_VM_SHIMS_EMITC_H_
+#define IREE_VM_SHIMS_EMITC_H_
 
 #include "iree/vm/module.h"
 #include "iree/vm/stack.h"
@@ -80,4 +80,4 @@
                    &results->ret0);
 }
 
-#endif  // IREE_VM_TEST_EMITC_SHIMS_H_
+#endif  // IREE_VM_SHIMS_EMITC_H_
diff --git a/iree/vm/test/emitc/CMakeLists.txt b/iree/vm/test/emitc/CMakeLists.txt
index 5cd9b8c..d3ddb0e 100644
--- a/iree/vm/test/emitc/CMakeLists.txt
+++ b/iree/vm/test/emitc/CMakeLists.txt
@@ -29,7 +29,7 @@
     iree::testing::gtest_main
     iree::vm::cc
     iree::vm::ops
-    iree::vm::shims
+    iree::vm::shims_emitc
     ::arithmetic_ops
     ::arithmetic_ops_i64
     ::assignment_ops