diff --git a/runtime/flangrti/iostdinit.c b/runtime/flangrti/iostdinit.c
index 2eba1b5962c..2d0d51928d7 100644
--- a/runtime/flangrti/iostdinit.c
+++ b/runtime/flangrti/iostdinit.c
@@ -90,7 +90,7 @@ __io_stderr(void)
 
 /* convert macros to routines */
 
-#if defined(TARGET_WIN) || defined(WIN32)
+#if defined(TARGET_WIN) || defined(_WIN32)
 #include <stdio.h>
 int
 __io_fgetc(FILE *p)
@@ -290,7 +290,7 @@ __io_timezone(void *tm)
 #endif
 }
 
-#if  (defined(WIN32) || defined(WIN64))
+#if  defined(_WIN32)
 /* OT 10 */
 void * 
 _pgi_get_iob(int xx) {
diff --git a/runtime/flangrti/trace_lin.c b/runtime/flangrti/trace_lin.c
index 961f0d834d6..5fbede6daa6 100644
--- a/runtime/flangrti/trace_lin.c
+++ b/runtime/flangrti/trace_lin.c
@@ -15,15 +15,12 @@
  *
  */
 
-#include <signal.h>
+#include <stdioInterf.h>
 #ifndef _WIN32
+#include "dumpregs.h"
+#include <signal.h>
 #include <sys/ucontext.h>
 #include <execinfo.h>
-#include "dumpregs.h"
-#else
-#include <windows.h>
-#endif
-#include <stdioInterf.h>
 
 /* codes and strings for signals */
 
@@ -196,4 +193,10 @@ __abort_sig_init(void)
   }
 }
 
+#else
+void __abort_trace(int skip)
+{ }
 
+void __abort_sig_init(void)
+{ }
+#endif
\ No newline at end of file