Index: Accel.c
===================================================================
diff -u -r9a59cef171550b5a9cb4f3028520c5d3f9d0c4c0 -rd1dab1d15616dfcf804743cf07870e92f3c83649
--- Accel.c	(.../Accel.c)	(revision 9a59cef171550b5a9cb4f3028520c5d3f9d0c4c0)
+++ Accel.c	(.../Accel.c)	(revision d1dab1d15616dfcf804743cf07870e92f3c83649)
@@ -14,11 +14,7 @@
  *
  **************************************************************************/
 
-#ifndef _VECTORCAST_
-    #include <math.h>
-#else
-    #define _VC_OVERRIDE_MATH_
-#endif
+#include <math.h>
 
 #include "Accel.h"
 #include "FPGA.h"
@@ -440,7 +436,7 @@
     F32 y = accelTilt[ ACCEL_AXIS_Y ];
 
     // is system tilted too much?
-    if ( ( FABS( x ) > MAX_TILT_ANGLE ) || ( FABS( y ) > MAX_TILT_ANGLE ) )
+    if ( ( fabs( x ) > MAX_TILT_ANGLE ) || ( fabs( y ) > MAX_TILT_ANGLE ) )
     {
         // excessive tilt must persist before triggering alarm
         if ( ++accelTiltErrorTimerCounter > MAX_TILT_PERSISTENCE )
@@ -452,7 +448,7 @@
 #endif
         }
     }
-    else if ( ( FABS( x ) <= MIN_TILT_ANGLE_TO_CLEAR_ALARM ) && ( FABS( y ) <= MIN_TILT_ANGLE_TO_CLEAR_ALARM ) )
+    else if ( ( fabs( x ) <= MIN_TILT_ANGLE_TO_CLEAR_ALARM ) && ( fabs( y ) <= MIN_TILT_ANGLE_TO_CLEAR_ALARM ) )
     {
         accelTiltErrorTimerCounter = 0;
 #ifdef _DG_
@@ -477,9 +473,9 @@
  *************************************************************************/
 static void checkForShockError( void )
 {
-    F32 maxX = FABS(getMaxAccelAxis( ACCEL_AXIS_X ));
-    F32 maxY = FABS(getMaxAccelAxis( ACCEL_AXIS_Y ));
-    F32 maxZ = FABS(getMaxAccelAxis( ACCEL_AXIS_Z ) - 1.0);  // when system level, expect Z axis to be at 1 g normally
+    F32 maxX = fabs(getMaxAccelAxis( ACCEL_AXIS_X ));
+    F32 maxY = fabs(getMaxAccelAxis( ACCEL_AXIS_Y ));
+    F32 maxZ = fabs(getMaxAccelAxis( ACCEL_AXIS_Z ) - 1.0);  // when system level, expect Z axis to be at 1 g normally
     F32 maxAll = maxX;
     ACCEL_AXIS_T maxAxis = ACCEL_AXIS_X;
 
@@ -553,7 +549,7 @@
             {
                 F32 vectorLen = calcVectorLength( accelAxes[ ACCEL_AXIS_X ].data, accelAxes[ ACCEL_AXIS_Y ].data, accelAxes[ ACCEL_AXIS_Z ].data );
 
-                if ( FABS(NOMINAL_ACCEL_VECTOR_LENGTH - vectorLen) < MAX_ACCEL_VECTOR_LENGTH_ERROR )
+                if ( fabs(NOMINAL_ACCEL_VECTOR_LENGTH - vectorLen) < MAX_ACCEL_VECTOR_LENGTH_ERROR )
                 {
                     result = SELF_TEST_STATUS_PASSED;
                 }
Index: Common.h
===================================================================
diff -u -r9a59cef171550b5a9cb4f3028520c5d3f9d0c4c0 -rd1dab1d15616dfcf804743cf07870e92f3c83649
--- Common.h	(.../Common.h)	(revision 9a59cef171550b5a9cb4f3028520c5d3f9d0c4c0)
+++ Common.h	(.../Common.h)	(revision d1dab1d15616dfcf804743cf07870e92f3c83649)
@@ -109,8 +109,6 @@
 
 // **** Common Macros ****
 
-#define ABS(v)                          ((v) < 0 ? (v) * -1 : (v))
-#define FABS(v)                         ((v) < 0.0 ? (v) * -1.0 : (v))
 #define FLOAT_TO_INT_WITH_ROUND(f)      ((f) < 0.0 ? (S32)((f) - FLOAT_TO_INT_ROUNDUP_OFFSET) : (S32)((f) + FLOAT_TO_INT_ROUNDUP_OFFSET))   ///< Macro converts a floating point value to an integer.
 #define CAP(v, u)                       ((v) > (u) ? (u) : (v))                                 ///< Macro caps a value to a maximum.
 #define RANGE(v, l, u)                  ((v) > (u) ? (u) : ((v) < (l) ? (l) : (v)))             ///< Macro enforces a range on a value.
@@ -177,14 +175,7 @@
     #define _enable_IRQ()
     #define _disable_IRQ()
     #define _enable_FIQ()
-
-#ifdef _VC_OVERRIDE_MATH_
-    #define fabs(v)     ((v) < 0.0 ? ((v) * -1.0) : (v))
-    extern F32 asin( F32 val );
-    extern F32 sqrt( F32 val );
-    extern F32 pow( F32 val, F32 exp );
 #endif
-#endif
 
 // include alarm mgmt header so any module can trigger an alarm
 #include "AlarmMgmt.h"