diff --git a/cmake-scripts/external-libs.cmake b/cmake-scripts/external-libs.cmake
index 0ff871db0..f166f847d 100644
--- a/cmake-scripts/external-libs.cmake
+++ b/cmake-scripts/external-libs.cmake
@@ -288,7 +288,7 @@ if (ENABLE_RPC_FEATURES)
         list(APPEND ASY_STATIC_LIBARIES fmem)
         list(APPEND ASYMPTOTE_INCLUDES $<TARGET_PROPERTY:fmem,INCLUDE_DIRECTORIES>)
     endif()
-    list(APPEND ASY_MACROS HAVE_RPC_RPC_H)
+    list(APPEND ASY_MACROS HAVE_LIBTIRPC)
 
 
 else()
diff --git a/include/win32xdr.h b/include/win32xdr.h
index 5fa3f8628..9d3234b9c 100644
--- a/include/win32xdr.h
+++ b/include/win32xdr.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#if defined(_WIN32) && defined(HAVE_RPC_RPC_H)
+#if defined(_WIN32) && defined(HAVE_LIBTIRPC)
 #include <cstdint>
 #include <cstring>
 #include <cstdio>
@@ -74,7 +74,7 @@ struct w32_internal_xdr_conv_fn<uint8_t>
   {
     return in;
   }
-  
+
   static auto constexpr host2NetFn = identity;
   static auto constexpr net2HostFn = identity;
 
@@ -165,4 +165,4 @@ bool w32_xdr_float(Win32XDR* xdrs, float* ip);
 bool w32_xdr_double(Win32XDR* xdrs, double* ip);
 
 
-#endif
\ No newline at end of file
+#endif
diff --git a/include/xdrcommon.h b/include/xdrcommon.h
index 46cabffc0..f62d2dcb5 100644
--- a/include/xdrcommon.h
+++ b/include/xdrcommon.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#if defined(HAVE_RPC_RPC_H)
+#if defined(HAVE_LIBTIRPC)
 #if defined(_WIN32)
 #include "win32xdr.h"
 typedef Win32XDR XDR;
@@ -79,4 +79,4 @@ inline bool_t xdr_u_long(XDR* __xdrs, unsigned long* __lp) {
 #include <rpc/rpc.h>
 #endif
 #endif
-#endif
\ No newline at end of file
+#endif
diff --git a/include/xstream.h b/include/xstream.h
index 3dd3b16d4..b87f91790 100644
--- a/include/xstream.h
+++ b/include/xstream.h
@@ -19,7 +19,7 @@
 #ifndef __xstream_h__
 #define __xstream_h__ 1
 
-#if defined(HAVE_RPC_RPC_H)
+#if defined(HAVE_LIBTIRPC)
 
 #include <cstdio>
 #include <iostream>
diff --git a/src/win32xdr.cc b/src/win32xdr.cc
index 6bce82355..227bc5939 100644
--- a/src/win32xdr.cc
+++ b/src/win32xdr.cc
@@ -1,4 +1,4 @@
-#if defined(_WIN32) && defined(HAVE_RPC_RPC_H)
+#if defined(_WIN32) && defined(HAVE_LIBTIRPC)
 
 #include "win32xdr.h"
 
@@ -92,4 +92,4 @@ bool w32_xdr_u_char(Win32XDR* xdrs, unsigned char* ip)
   return w32_internal_xdr_u_type<uint8_t>(xdrs, ip);
 }
 
-#endif
\ No newline at end of file
+#endif
diff --git a/src/xstream.cc b/src/xstream.cc
index a62e88e1a..a31bce70b 100644
--- a/src/xstream.cc
+++ b/src/xstream.cc
@@ -1,4 +1,4 @@
-#if defined(HAVE_RPC_RPC_H)
+#if defined(HAVE_LIBTIRPC)
 #include "xstream.h"
 
 namespace xdr
@@ -20,7 +20,7 @@ xbyte::operator unsigned char() const
   return c;
 }
 
-// xios 
+// xios
 int xios::good() const { return _state == 0; }
 int xios::eof() const { return _state & eofbit; }
 int xios::fail() const { return !good();}
@@ -50,7 +50,7 @@ OffsetType xstream::tell() {
 ixstream::ixstream(bool singleprecision)
   : singleprecision(singleprecision)
 {
-  
+
 }
 
 void ixstream::open(const char* filename, open_mode)
@@ -121,7 +121,7 @@ ixstream& ixstream::operator>>(xbyte& x)
 // oxstream
 oxstream::oxstream(bool singleprecision): singleprecision(singleprecision)
 {
-  
+
 }
 void oxstream::open(const char* filename, open_mode mode)
 {
@@ -307,7 +307,7 @@ void ioxstream::close() {
 }
 ioxstream::ioxstream()
 {
-  
+
 }
 ioxstream::ioxstream(const char* filename)
 {