diff --git a/ctaocrypt/src/asn.c b/ctaocrypt/src/asn.c
index 3c348de7c..66c3135b6 100644
--- a/ctaocrypt/src/asn.c
+++ b/ctaocrypt/src/asn.c
@@ -27,7 +27,7 @@
 
 #ifndef NO_ASN
 
-#ifdef THREADX
+#ifdef HAVE_RTP_SYS
     #include "os.h"           /* dc_rtc_api needs    */
     #include "dc_rtc_api.h"   /* to get current time */
 #endif
@@ -82,7 +82,7 @@
 #endif
 
 
-#ifdef THREADX
+#ifdef HAVE_RTP_SYS 
     /* uses parital <time.h> structures */
     #define XTIME(tl)  (0)
     #define XGMTIME(c) my_gmtime((c))
@@ -237,7 +237,7 @@ struct tm* gmtime(const time_t* timer)
 #endif /* _WIN32_WCE  || USER_TIME */
 
 
-#ifdef  THREADX
+#ifdef HAVE_RTP_SYS  
 
 #define YEAR0          1900
 
@@ -259,7 +259,7 @@ struct tm* my_gmtime(const time_t* timer)       /* has a gmtime() but hangs */
     return ret;
 }
 
-#endif /* THREADX */
+#endif /* HAVE_RTP_SYS */
 
 
 #if defined(MICROCHIP_TCPIP_V5) || defined(MICROCHIP_TCPIP)
diff --git a/ctaocrypt/src/random.c b/ctaocrypt/src/random.c
index 250dbb9d9..4f167e8ea 100644
--- a/ctaocrypt/src/random.c
+++ b/ctaocrypt/src/random.c
@@ -413,7 +413,7 @@ int GenerateSeed(OS_Seed* os, byte* output, word32 sz)
 }
 
 
-#elif defined(THREADX) || defined(EBSNET)
+#elif defined(HAVE_RTP_SYS) || defined(EBSNET)
 
 #include "rtprand.h"   /* rtp_rand () */
 #include "rtptime.h"   /* rtp_get_system_msec() */
@@ -593,7 +593,7 @@ int GenerateSeed(OS_Seed* os, byte* output, word32 sz)
 */
 
 
-#else /* !USE_WINDOWS_API && !THREADX && !MICRIUM && !NO_DEV_RANDOM */
+#else /* !USE_WINDOWS_API && !HAVE_RPT_SYS && !MICRIUM && !NO_DEV_RANDOM */
 
 
 /* may block */
diff --git a/cyassl/ctaocrypt/types.h b/cyassl/ctaocrypt/types.h
index 9d367feab..a9438eb85 100644
--- a/cyassl/ctaocrypt/types.h
+++ b/cyassl/ctaocrypt/types.h
@@ -111,10 +111,10 @@ enum {
         #define INLINE __inline
     #elif defined(__GNUC__)
         #define INLINE inline
-    #elif defined(THREADX)
-        #define INLINE _Inline
     #elif defined(__IAR_SYSTEMS_ICC__)
         #define INLINE inline
+    #elif defined(THREADX)
+        #define INLINE _Inline
     #else
         #define INLINE 
     #endif
diff --git a/src/internal.c b/src/internal.c
index e259e5675..ec129d626 100644
--- a/src/internal.c
+++ b/src/internal.c
@@ -2094,7 +2094,7 @@ ProtocolVersion MakeDTLSv1_2(void)
         return (word32)(count.QuadPart / freq.QuadPart);
     }
 
-#elif defined(THREADX)
+#elif defined(HAVE_RTP_SYS)
 
     #include "rtptime.h"
 
@@ -2143,7 +2143,7 @@ ProtocolVersion MakeDTLSv1_2(void)
         */
     }
 #endif
-#else /* !USE_WINDOWS_API && !THREADX && !MICRIUM && !USER_TICKS */
+#else /* !USE_WINDOWS_API && !HAVE_RTP_SYS && !MICRIUM && !USER_TICKS */
 
     #include <time.h>
 
diff --git a/src/io.c b/src/io.c
index 0fad73b21..15320fac2 100644
--- a/src/io.c
+++ b/src/io.c
@@ -62,7 +62,7 @@
         #undef RNG
         #define RNG CyaSSL_RNG 
         /* for avoiding name conflict in "stm32f2xx.h" */
-        static int errno ;
+        static int errno;
     #else
         #include <sys/types.h>
         #include <errno.h>
@@ -70,7 +70,7 @@
             #include <unistd.h>
         #endif
         #include <fcntl.h>
-        #if !(defined(DEVKITPRO) || defined(THREADX) || defined(EBSNET))
+        #if !(defined(DEVKITPRO) || defined(HAVE_RTP_SYS) || defined(EBSNET))
             #include <sys/socket.h>
             #include <arpa/inet.h>
             #include <netinet/in.h>
@@ -81,7 +81,7 @@
                 #include <sys/ioctl.h>
             #endif
         #endif
-        #ifdef THREADX
+        #ifdef HAVE_RTP_SYS
             #include <socket.h>
         #endif
         #ifdef EBSNET