diff --git a/src/util/hwf.cpp b/src/util/hwf.cpp
index 5a41ac86c..94255bb84 100644
--- a/src/util/hwf.cpp
+++ b/src/util/hwf.cpp
@@ -17,16 +17,15 @@ Revision History:
 
 --*/
 #include<float.h>
+#include<sstream>
 
 #ifdef _WINDOWS
 #pragma float_control( except, on )   // exception semantics; this does _not_ mean that exceptions are enabled (we want them off!)
 #pragma float_control( precise, on )  // precise semantics (no guessing!)
 #pragma fp_contract(off)              // contractions off (`contraction' means x*y+z is turned into a fused-mul-add).
 #pragma fenv_access(on)               // fpu environment sensitivity (needed to be allowed to make FPU mode changes).
+#include<amp_math.h>
 #else
-#ifdef _WINDOWS
-#pragma STDC FENV_ACCESS ON
-#endif
 #include <math.h>
 #include <fenv.h>
 #endif
@@ -35,8 +34,6 @@ Revision History:
 #define USE_INTRINSICS
 #endif
 
-#include<sstream>
-
 #include"hwf.h"
 
 // Note: