diff --git a/tools/flang1/flang1exe/bblock.c b/tools/flang1/flang1exe/bblock.c
index dc68a25e27c..5f9d83e5c64 100644
--- a/tools/flang1/flang1exe/bblock.c
+++ b/tools/flang1/flang1exe/bblock.c
@@ -21,7 +21,7 @@
 #include "transfrm.h"
 #include "extern.h"
 #include "dinit.h"
-#include "direct.h"
+#include "fdirect.h"
 #include "pd.h"
 #include "rtlRtns.h"
 
diff --git a/tools/flang1/flang1exe/comm.c b/tools/flang1/flang1exe/comm.c
index 37e78c1e4f3..ecdc2ffbab0 100644
--- a/tools/flang1/flang1exe/comm.c
+++ b/tools/flang1/flang1exe/comm.c
@@ -26,7 +26,7 @@
 #include "commopt.h"
 #include "ccffinfo.h"
 #include "dinit.h"
-#include "direct.h"
+#include "fdirect.h"
 #include "rte.h"
 #include "rtlRtns.h"
 
diff --git a/tools/flang1/flang1exe/commgen.c b/tools/flang1/flang1exe/commgen.c
index 5f7735bc1f5..f77f01fd9c6 100644
--- a/tools/flang1/flang1exe/commgen.c
+++ b/tools/flang1/flang1exe/commgen.c
@@ -24,7 +24,7 @@
 #include "extern.h"
 #include "commopt.h"
 #include "rte.h"
-#include "direct.h"
+#include "fdirect.h"
 #include "rtlRtns.h"
 
 static void generate_forall(int);
diff --git a/tools/flang1/flang1exe/comminvar.c b/tools/flang1/flang1exe/comminvar.c
index 7dbf7565179..0623430d73b 100644
--- a/tools/flang1/flang1exe/comminvar.c
+++ b/tools/flang1/flang1exe/comminvar.c
@@ -23,7 +23,7 @@
 #include "extern.h"
 #include "commopt.h"
 #include "ccffinfo.h"
-#include "direct.h"
+#include "fdirect.h"
 
 /* Compiler switches:
     -x 49 0x20000:	Inhibit invariant communication hoisting
diff --git a/tools/flang1/flang1exe/datadep.c b/tools/flang1/flang1exe/datadep.c
index 08998d2da18..966837bb41c 100644
--- a/tools/flang1/flang1exe/datadep.c
+++ b/tools/flang1/flang1exe/datadep.c
@@ -22,7 +22,7 @@
 #include "induc.h"
 
 #include "soc.h"
-#include "direct.h"
+#include "fdirect.h"
 #include "extern.h"
 
 #if DEBUG
diff --git a/tools/flang1/flang1exe/flow.c b/tools/flang1/flang1exe/flow.c
index f0845c58d3a..1f3305217d9 100644
--- a/tools/flang1/flang1exe/flow.c
+++ b/tools/flang1/flang1exe/flow.c
@@ -26,7 +26,7 @@
 #include "flow_util.h"
 #include "pragma.h"
 #include "symutl.h"
-#include "direct.h"
+#include "fdirect.h"
 #include "extern.h"
 #include "rtlRtns.h"
 
diff --git a/tools/flang1/flang1exe/func.c b/tools/flang1/flang1exe/func.c
index 77632cfefe8..f2a4ac9e758 100644
--- a/tools/flang1/flang1exe/func.c
+++ b/tools/flang1/flang1exe/func.c
@@ -27,7 +27,7 @@
 #include "ccffinfo.h"
 #include "dinit.h"
 #include "rte.h"
-#include "direct.h"
+#include "fdirect.h"
 #ifdef TARGET_X86
 #include "x86.h"
 #endif
diff --git a/tools/flang1/flang1exe/hlvect.c b/tools/flang1/flang1exe/hlvect.c
index 16b37840fe5..b5b6602b134 100644
--- a/tools/flang1/flang1exe/hlvect.c
+++ b/tools/flang1/flang1exe/hlvect.c
@@ -20,7 +20,7 @@
 #include "nme.h"
 #include "optimize.h"
 #include "hlvect.h"
-#include "direct.h"
+#include "fdirect.h"
 #include "ccffinfo.h"
 #include "symutl.h"
 #include "induc.h"
diff --git a/tools/flang1/flang1exe/inliner.c b/tools/flang1/flang1exe/inliner.c
index d488438a016..ced3d31f72f 100644
--- a/tools/flang1/flang1exe/inliner.c
+++ b/tools/flang1/flang1exe/inliner.c
@@ -23,7 +23,7 @@
 #include "interf.h"
 #include "inliner.h"
 #include "ccffinfo.h"
-#include "direct.h"
+#include "fdirect.h"
 
 /* Switches:
  *	-q 49 1:	Trace
diff --git a/tools/flang1/flang1exe/lower.c b/tools/flang1/flang1exe/lower.c
index e5b6ea825bf..6e256743702 100644
--- a/tools/flang1/flang1exe/lower.c
+++ b/tools/flang1/flang1exe/lower.c
@@ -16,7 +16,7 @@
 #include "symtab.h"
 #include "dtypeutl.h"
 #include "ast.h"
-#include "direct.h"
+#include "fdirect.h"
 #include "rtlRtns.h"
 
 #define INSIDE_LOWER
diff --git a/tools/flang1/flang1exe/main.c b/tools/flang1/flang1exe/main.c
index 453680f579e..70290d77458 100644
--- a/tools/flang1/flang1exe/main.c
+++ b/tools/flang1/flang1exe/main.c
@@ -30,7 +30,7 @@
 #include "dbg_out.h"
 #include "ccffinfo.h"
 #include "x86.h"
-#include "direct.h"
+#include "fdirect.h"
 #include "optimize.h"
 #include "transfrm.h"
 #include "extern.h"
diff --git a/tools/flang1/flang1exe/outconv.c b/tools/flang1/flang1exe/outconv.c
index a5e041d7cbe..ebec15463e0 100644
--- a/tools/flang1/flang1exe/outconv.c
+++ b/tools/flang1/flang1exe/outconv.c
@@ -31,7 +31,7 @@
 #include "rte.h"
 #undef RTE_C
 #include "comm.h"
-#include "direct.h"
+#include "fdirect.h"
 #include "rtlRtns.h"
 
 static void convert_statements(void);
diff --git a/tools/flang1/flang1exe/psemsmp.c b/tools/flang1/flang1exe/psemsmp.c
index 6f3413612d4..f822e68e359 100644
--- a/tools/flang1/flang1exe/psemsmp.c
+++ b/tools/flang1/flang1exe/psemsmp.c
@@ -18,7 +18,7 @@
 #include "scan.h"
 #include "semstk.h"
 #include "ast.h"
-#include "direct.h"
+#include "fdirect.h"
 
 /**
    \param rednum   reduction number
diff --git a/tools/flang1/flang1exe/semant.c b/tools/flang1/flang1exe/semant.c
index 85628d15870..69cf8f56cb5 100644
--- a/tools/flang1/flang1exe/semant.c
+++ b/tools/flang1/flang1exe/semant.c
@@ -28,7 +28,7 @@
 #include "rte.h"
 #include "pd.h"
 #include "interf.h"
-#include "direct.h"
+#include "fdirect.h"
 #include "fih.h"
 
 #include "atomic_common.h"
diff --git a/tools/flang1/flang1exe/semant3.c b/tools/flang1/flang1exe/semant3.c
index f6493f0d1e0..67bf458543b 100644
--- a/tools/flang1/flang1exe/semant3.c
+++ b/tools/flang1/flang1exe/semant3.c
@@ -25,7 +25,7 @@
 #include "ast.h"
 #include "dinit.h"
 #include "pragma.h"
-#include "direct.h"
+#include "fdirect.h"
 #include "rte.h"
 #include "hpfutl.h"
 #include "lower.h"
diff --git a/tools/flang1/flang1exe/semsmp.c b/tools/flang1/flang1exe/semsmp.c
index e1d68cf0c69..a07d458435f 100644
--- a/tools/flang1/flang1exe/semsmp.c
+++ b/tools/flang1/flang1exe/semsmp.c
@@ -21,7 +21,7 @@
 #include "scan.h"
 #include "semstk.h"
 #include "ast.h"
-#include "direct.h"
+#include "fdirect.h"
 #include "pragma.h"
 #include "x86.h"
 
diff --git a/tools/flang1/flang1exe/semtbp.c b/tools/flang1/flang1exe/semtbp.c
index a16a43b4afd..f2cf89c139f 100644
--- a/tools/flang1/flang1exe/semtbp.c
+++ b/tools/flang1/flang1exe/semtbp.c
@@ -28,7 +28,7 @@
 #include "rte.h"
 #include "pd.h"
 #include "interf.h"
-#include "direct.h"
+#include "fdirect.h"
 #include "fih.h"
 
 /** \brief Macro for clearing/zeroing out stale dtypes and sptrs in tbp_queue */
diff --git a/tools/flang1/flang1exe/semutil.c b/tools/flang1/flang1exe/semutil.c
index 96d124f6b18..7437ef360ba 100644
--- a/tools/flang1/flang1exe/semutil.c
+++ b/tools/flang1/flang1exe/semutil.c
@@ -25,7 +25,7 @@
 #define RTE_C
 #include "rte.h"
 #include "pd.h"
-#include "direct.h"
+#include "fdirect.h"
 #include "go.h"
 #include "rtlRtns.h"
 
diff --git a/tools/flang2/flang2exe/main.cpp b/tools/flang2/flang2exe/main.cpp
index 386913a1dbd..bb95d3aceda 100644
--- a/tools/flang2/flang2exe/main.cpp
+++ b/tools/flang2/flang2exe/main.cpp
@@ -40,7 +40,7 @@
 #include "upper.h"
 #include "semant.h"
 #include "dwarf2.h"
-#include "direct.h"
+#include "fdirect.h"
 #include "expand.h"
 #include "scope.h"
 #include <stdbool.h>
diff --git a/tools/flang2/flang2exe/upper.cpp b/tools/flang2/flang2exe/upper.cpp
index f214ebb649e..9cccf6f65a4 100644
--- a/tools/flang2/flang2exe/upper.cpp
+++ b/tools/flang2/flang2exe/upper.cpp
@@ -98,7 +98,7 @@ static void data_pop_const(void);
 static void data_push_const(void);
 static void read_global(void);
 static int read_CCFF(void);
-#include "direct.h"
+#include "fdirect.h"
 static void read_contained(void);
 
 typedef struct CGR_LIST {
diff --git a/tools/shared/direct.c b/tools/shared/direct.c
index 0104dfd0918..8f7e3ac6230 100644
--- a/tools/shared/direct.c
+++ b/tools/shared/direct.c
@@ -9,7 +9,7 @@
  * \brief Directive/pragma support modules
  */
 
-#include "direct.h"
+#include "fdirect.h"
 #include "pragma.h"
 #include "ilidir.h"
 #include "miscutil.h"
diff --git a/tools/shared/direct.h b/tools/shared/fdirect.h
similarity index 100%
rename from tools/shared/direct.h
rename to tools/shared/fdirect.h
diff --git a/tools/shared/ilidir.c b/tools/shared/ilidir.c
index f24b133cee3..bfcdbc2a7bb 100644
--- a/tools/shared/ilidir.c
+++ b/tools/shared/ilidir.c
@@ -17,7 +17,7 @@
 #include "global.h"
 #include "error.h"
 #include "symtab.h"
-#include "direct.h"
+#include "fdirect.h"
 
 #if DEBUG
 #define TR0(s)         \
diff --git a/tools/shared/pragma.c b/tools/shared/pragma.c
index ca0fb1e1973..0956139ef19 100644
--- a/tools/shared/pragma.c
+++ b/tools/shared/pragma.c
@@ -19,7 +19,7 @@
 #ifndef FE90
 #include "semsym.h"
 #endif
-#include "direct.h"
+#include "fdirect.h"
 
 #if defined(TARGET_X8664) && (!defined(FE90) || defined(PGF90))
 #include "x86.h"