diff --git a/compiler-rt/cmake/base-config-ix.cmake b/compiler-rt/cmake/base-config-ix.cmake
--- a/compiler-rt/cmake/base-config-ix.cmake
+++ b/compiler-rt/cmake/base-config-ix.cmake
@@ -4,12 +4,13 @@
 # runtime libraries.
 
 include(CheckIncludeFile)
+include(CheckIncludeFiles)
 include(CheckCXXSourceCompiles)
 
 check_include_file(unwind.h HAVE_UNWIND_H)
 
 # Used by sanitizer_common and tests.
-check_include_file(rpc/xdr.h HAVE_RPC_XDR_H)
+check_include_files("rpc/types.h;rpc/xdr.h" HAVE_RPC_XDR_H)
 if (NOT HAVE_RPC_XDR_H)
   set(HAVE_RPC_XDR_H 0)
 endif()
diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cc b/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cc
--- a/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cc
+++ b/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cc
@@ -114,6 +114,7 @@
 #include <netipx/ipx.h>
 #include <netrom/netrom.h>
 #if HAVE_RPC_XDR_H
+# include <rpc/types.h>
 # include <rpc/xdr.h>
 #endif
 #include <scsi/scsi.h>
diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_solaris.cc b/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_solaris.cc
--- a/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_solaris.cc
+++ b/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_solaris.cc
@@ -28,6 +28,7 @@
 #include <poll.h>
 #include <pthread.h>
 #include <pwd.h>
+#include <rpc/types.h>
 #include <rpc/xdr.h>
 #include <semaphore.h>
 #include <signal.h>
diff --git a/compiler-rt/test/msan/Linux/sunrpc.cc b/compiler-rt/test/msan/Linux/sunrpc.cc
--- a/compiler-rt/test/msan/Linux/sunrpc.cc
+++ b/compiler-rt/test/msan/Linux/sunrpc.cc
@@ -14,6 +14,7 @@
 // RUN:     not %run %t 2>&1 | FileCheck %s
 
 #include <assert.h>
+#include <rpc/types.h>
 #include <rpc/xdr.h>
 
 #include <sanitizer/msan_interface.h>
diff --git a/compiler-rt/test/msan/Linux/sunrpc_bytes.cc b/compiler-rt/test/msan/Linux/sunrpc_bytes.cc
--- a/compiler-rt/test/msan/Linux/sunrpc_bytes.cc
+++ b/compiler-rt/test/msan/Linux/sunrpc_bytes.cc
@@ -7,6 +7,7 @@
 
 #include <assert.h>
 #include <string.h>
+#include <rpc/types.h>
 #include <rpc/xdr.h>
 
 #include <sanitizer/msan_interface.h>
diff --git a/compiler-rt/test/msan/Linux/sunrpc_string.cc b/compiler-rt/test/msan/Linux/sunrpc_string.cc
--- a/compiler-rt/test/msan/Linux/sunrpc_string.cc
+++ b/compiler-rt/test/msan/Linux/sunrpc_string.cc
@@ -7,6 +7,7 @@
 
 #include <assert.h>
 #include <string.h>
+#include <rpc/types.h>
 #include <rpc/xdr.h>
 
 #include <sanitizer/msan_interface.h>