diff --git a/aten/src/ATen/core/ScalarType.h b/aten/src/ATen/core/ScalarType.h
index f6cc930..e4bbc83 100644
--- a/aten/src/ATen/core/ScalarType.h
+++ b/aten/src/ATen/core/ScalarType.h
@@ -2,7 +2,7 @@
 
 #include <c10/util/ArrayRef.h>
 #include "ATen/core/Half.h"
-#include "ATen/core/typeid.h"
+#include <c10/util/typeid.h>
 
 #include <cstdint>
 #include <iostream>
diff --git a/aten/src/ATen/core/blob.h b/aten/src/ATen/core/blob.h
index ee31bf0..1a6b21e 100644
--- a/aten/src/ATen/core/blob.h
+++ b/aten/src/ATen/core/blob.h
@@ -7,7 +7,7 @@
 #include <vector>
 
 #include <ATen/core/intrusive_ptr.h>
-#include <ATen/core/typeid.h>
+#include <c10/util/typeid.h>
 #include <c10/macros/Macros.h>
 
 namespace caffe2 {
diff --git a/aten/src/ATen/core/context_base.h b/aten/src/ATen/core/context_base.h
index 2d71c3b..3466794 100644
--- a/aten/src/ATen/core/context_base.h
+++ b/aten/src/ATen/core/context_base.h
@@ -8,7 +8,7 @@
 
 #include <ATen/core/ATenGeneral.h>
 #include <ATen/core/Allocator.h>
-#include <ATen/core/typeid.h>
+#include <c10/util/typeid.h>
 #include <c10/util/Exception.h>
 #include <c10/util/Registry.h>
 
diff --git a/aten/src/THC/generic/THCStorage.cpp b/aten/src/THC/generic/THCStorage.cpp
index 36a0010..ada74ce 100644
--- a/aten/src/THC/generic/THCStorage.cpp
+++ b/aten/src/THC/generic/THCStorage.cpp
@@ -3,7 +3,7 @@
 #else
 
 #include <ATen/core/intrusive_ptr.h>
-#include <ATen/core/typeid.h>
+#include <c10/util/typeid.h>
 
 scalar_t* THCStorage_(data)(THCState *state, const THCStorage *self)
 {
diff --git a/caffe2/contrib/gloo/context.cc b/caffe2/contrib/gloo/context.cc
index 5325a4a..3ed90e4 100644
--- a/caffe2/contrib/gloo/context.cc
+++ b/caffe2/contrib/gloo/context.cc
@@ -1,6 +1,6 @@
 #include "context.h"
 
-#include "caffe2/core/typeid.h"
+#include <c10/util/typeid.h>
 
 #include <gloo/types.h>
 
diff --git a/caffe2/core/allocator.cc b/caffe2/core/allocator.cc
index 64eabe8..f713599 100644
--- a/caffe2/core/allocator.cc
+++ b/caffe2/core/allocator.cc
@@ -1,7 +1,7 @@
 #include <ATen/core/Allocator.h>
 #include "caffe2/core/context.h"
 #include "caffe2/core/logging.h"
-#include "caffe2/core/typeid.h"
+#include <c10/util/typeid.h>
 
 C10_DEFINE_bool(
     caffe2_report_cpu_memory_usage,
diff --git a/caffe2/core/blob.h b/caffe2/core/blob.h
index a357251..2eeb30b 100644
--- a/caffe2/core/blob.h
+++ b/caffe2/core/blob.h
@@ -9,7 +9,7 @@
 #include "caffe2/core/common.h"
 
 #include <ATen/core/blob.h>
-#include <ATen/core/typeid.h>
+#include <c10/util/typeid.h>
 #include "caffe2/core/logging.h"
 #include "caffe2/core/tensor.h"
 
diff --git a/caffe2/core/blob_serialization.h b/caffe2/core/blob_serialization.h
index ccb86f5..910d4da 100644
--- a/caffe2/core/blob_serialization.h
+++ b/caffe2/core/blob_serialization.h
@@ -9,7 +9,7 @@
 #include "caffe2/core/blob.h"
 #include "caffe2/core/blob_serializer_base.h"
 #include "caffe2/core/tensor.h"
-#include "caffe2/core/typeid.h"
+#include <c10/util/typeid.h>
 #include "caffe2/core/types.h"
 #include "caffe2/utils/simple_queue.h"
 
diff --git a/caffe2/core/blob_stats.h b/caffe2/core/blob_stats.h
index 5c9f80f..e05b451 100644
--- a/caffe2/core/blob_stats.h
+++ b/caffe2/core/blob_stats.h
@@ -2,7 +2,7 @@
 
 #include "c10/util/Registry.h"
 #include "caffe2/core/blob.h"
-#include "caffe2/core/typeid.h"
+#include <c10/util/typeid.h>
 
 #include <unordered_map>
 
diff --git a/caffe2/core/context.h b/caffe2/core/context.h
index 3f03e3d..4a263b3 100644
--- a/caffe2/core/context.h
+++ b/caffe2/core/context.h
@@ -10,7 +10,7 @@
 #include "caffe2/core/context_base.h"
 #include "caffe2/core/event.h"
 #include "caffe2/core/logging.h"
-#include "caffe2/core/typeid.h"
+#include <c10/util/typeid.h>
 #include "caffe2/proto/caffe2_pb.h"
 
 #include <ATen/core/ATenCoreTest.h>
diff --git a/caffe2/core/dispatch/DispatchKey.h b/caffe2/core/dispatch/DispatchKey.h
index fdbfc16..cfe9277 100644
--- a/caffe2/core/dispatch/DispatchKey.h
+++ b/caffe2/core/dispatch/DispatchKey.h
@@ -2,7 +2,7 @@
 
 #include "caffe2/core/dispatch/DeviceId.h"
 #include "caffe2/core/dispatch/LayoutId.h"
-#include "caffe2/core/typeid.h"
+#include <c10/util/typeid.h>
 
 #include <vector>
 #include <functional>
diff --git a/caffe2/core/int8_serialization.cc b/caffe2/core/int8_serialization.cc
index 29053ad..ce2eb7b 100644
--- a/caffe2/core/int8_serialization.cc
+++ b/caffe2/core/int8_serialization.cc
@@ -2,7 +2,7 @@
 #include "caffe2/core/common.h"
 #include "caffe2/core/context.h"
 #include "caffe2/core/tensor_int8.h"
-#include "caffe2/core/typeid.h"
+#include <c10/util/typeid.h>
 #include "caffe2/core/types.h"
 
 namespace caffe2 {
diff --git a/caffe2/core/module.h b/caffe2/core/module.h
index c441920..37e9a12 100644
--- a/caffe2/core/module.h
+++ b/caffe2/core/module.h
@@ -14,7 +14,7 @@
 #include <mutex>
 
 #include "caffe2/core/common.h"
-#include "caffe2/core/typeid.h"
+#include <c10/util/typeid.h>
 
 namespace caffe2 {
 
diff --git a/caffe2/core/qtensor.h b/caffe2/core/qtensor.h
index ed0d0fa..8ee5a5d 100644
--- a/caffe2/core/qtensor.h
+++ b/caffe2/core/qtensor.h
@@ -9,7 +9,7 @@
 #include "caffe2/core/common.h"
 #include "caffe2/core/context.h"
 #include "caffe2/core/tensor.h"
-#include "caffe2/core/typeid.h"
+#include <c10/util/typeid.h>
 
 namespace caffe2 {
 
diff --git a/caffe2/core/storage.h b/caffe2/core/storage.h
index b88e06d..cd9ab06 100644
--- a/caffe2/core/storage.h
+++ b/caffe2/core/storage.h
@@ -14,7 +14,7 @@
 #include "caffe2/core/context.h"
 #include "caffe2/core/flags.h"
 #include "caffe2/core/logging.h"
-#include "caffe2/core/typeid.h"
+#include <c10/util/typeid.h>
 
 #include <ATen/core/Allocator.h>
 #include <c10/Device.h>
diff --git a/caffe2/core/tensor_int8.cc b/caffe2/core/tensor_int8.cc
index abb9b5b..8d8121d 100644
--- a/caffe2/core/tensor_int8.cc
+++ b/caffe2/core/tensor_int8.cc
@@ -1,5 +1,5 @@
 #include "caffe2/core/tensor_int8.h"
-#include "caffe2/core/typeid.h"
+#include <c10/util/typeid.h>
 
 namespace caffe2 {
 CAFFE_KNOWN_TYPE(int8::Int8TensorCPU);
diff --git a/caffe2/core/typeid.h b/caffe2/core/typeid.h
deleted file mode 100644
index 138aa7b..0000000
--- a/caffe2/core/typeid.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#pragma once
-
-// If I omit this header, the Windows build fails.  The error message
-// was sufficiently bad that I couldn't figure out which downstream file
-// was missing the include of common.h.  So keep it here for BC.
-#include <caffe2/core/common.h>
-#include <c10/util/typeid.h>
diff --git a/caffe2/core/types.cc b/caffe2/core/types.cc
index c7eff8f..3e9f978 100644
--- a/caffe2/core/types.cc
+++ b/caffe2/core/types.cc
@@ -1,5 +1,5 @@
 #include "caffe2/core/types.h"
-#include "caffe2/core/typeid.h"
+#include <c10/util/typeid.h>
 
 #include <atomic>
 #include <memory>
diff --git a/caffe2/core/types.h b/caffe2/core/types.h
index 5f66597..9bbc9b8 100644
--- a/caffe2/core/types.h
+++ b/caffe2/core/types.h
@@ -7,7 +7,7 @@
 
 #include "caffe2/core/common.h"
 #include "caffe2/core/logging.h"
-#include "caffe2/core/typeid.h"
+#include <c10/util/typeid.h>
 #include "caffe2/proto/caffe2_pb.h"
 #include <ATen/core/Half.h>
 
diff --git a/caffe2/distributed/store_handler.cc b/caffe2/distributed/store_handler.cc
index 5c585f8..549d3d5 100644
--- a/caffe2/distributed/store_handler.cc
+++ b/caffe2/distributed/store_handler.cc
@@ -2,7 +2,7 @@
 
 #include <memory>
 
-#include "caffe2/core/typeid.h"
+#include <c10/util/typeid.h>
 
 namespace caffe2 {
 
diff --git a/caffe2/mobile/contrib/opengl/core/GLImage.cc b/caffe2/mobile/contrib/opengl/core/GLImage.cc
index 7c7f242..19956e5 100644
--- a/caffe2/mobile/contrib/opengl/core/GLImage.cc
+++ b/caffe2/mobile/contrib/opengl/core/GLImage.cc
@@ -1,7 +1,7 @@
 
 #include "GLImage.h"
 #include "arm_neon_support.h"
-#include "caffe2/core/typeid.h"
+#include <c10/util/typeid.h>
 
 namespace caffe2 {
 CAFFE_KNOWN_TYPE(GLImage<float>);
diff --git a/caffe2/mpi/mpi_common.cc b/caffe2/mpi/mpi_common.cc
index ff5bef6..49f4283 100644
--- a/caffe2/mpi/mpi_common.cc
+++ b/caffe2/mpi/mpi_common.cc
@@ -2,7 +2,7 @@
 
 #include <thread>
 
-#include "caffe2/core/typeid.h"
+#include <c10/util/typeid.h>
 #include "caffe2/utils/proto_utils.h"
 
 namespace caffe2 {
diff --git a/caffe2/operators/quant_decode_op.cc b/caffe2/operators/quant_decode_op.cc
index 4164431..cd2ffdd 100644
--- a/caffe2/operators/quant_decode_op.cc
+++ b/caffe2/operators/quant_decode_op.cc
@@ -1,7 +1,7 @@
 #include "quant_decode_op.h"
 #include <stdint.h>
 #include "caffe2/core/tensor.h"
-#include "caffe2/core/typeid.h"
+#include <c10/util/typeid.h>
 
 namespace caffe2 {
 
diff --git a/caffe2/operators/quant_decode_op.h b/caffe2/operators/quant_decode_op.h
index 0462a89..ebf7659 100644
--- a/caffe2/operators/quant_decode_op.h
+++ b/caffe2/operators/quant_decode_op.h
@@ -4,7 +4,7 @@
 #include "caffe2/core/context.h"
 #include "caffe2/core/operator.h"
 #include "caffe2/core/tensor.h"
-#include "caffe2/core/typeid.h"
+#include <c10/util/typeid.h>
 
 namespace caffe2 {