diff --git a/tensorflow/core/kernels/ragged_tensor_to_tensor_op.cc b/tensorflow/core/kernels/ragged_tensor_to_tensor_op.cc
index 21b929f642d..9199fcf6d9c 100644
--- a/tensorflow/core/kernels/ragged_tensor_to_tensor_op.cc
+++ b/tensorflow/core/kernels/ragged_tensor_to_tensor_op.cc
@@ -36,7 +36,7 @@ limitations under the License.
 #include "tensorflow/core/lib/core/errors.h"
 #include "tensorflow/core/lib/core/status.h"
 #include "tensorflow/core/ops/ragged_to_dense_util.h"
-#include "tensorflow/core/platform/default/integral_types.h"
+#include "tensorflow/core/platform/types.h"
 #include "tensorflow/core/util/bcast.h"
 
 namespace tensorflow {
diff --git a/tensorflow/lite/toco/toco_types.h b/tensorflow/lite/toco/toco_types.h
index da2efd6724a..76dd1b0348d 100644
--- a/tensorflow/lite/toco/toco_types.h
+++ b/tensorflow/lite/toco/toco_types.h
@@ -16,13 +16,9 @@ limitations under the License.
 #define TENSORFLOW_LITE_TOCO_TOCO_TYPES_H_
 
 #include <string>
-#include "tensorflow/core/platform/platform.h"
 
-#if defined(PLATFORM_GOOGLE) || defined(GOOGLE_INTEGRAL_TYPES)
-#include "tensorflow/core/platform/google/integral_types.h"
-#else
-#include "tensorflow/core/platform/default/integral_types.h"
-#endif
+#include "tensorflow/core/platform/platform.h"
+#include "tensorflow/core/platform/types.h"
 
 namespace toco {
 #ifdef PLATFORM_GOOGLE