Index: Common.h
===================================================================
diff -u -r7af12502ddbf9528ce1a8088c42690a0d4385952 -r2ab9e69d455e8014b471eed94a83383bd33b9d58
--- Common.h	(.../Common.h)	(revision 7af12502ddbf9528ce1a8088c42690a0d4385952)
+++ Common.h	(.../Common.h)	(revision 2ab9e69d455e8014b471eed94a83383bd33b9d58)
@@ -19,25 +19,6 @@
 
 #include "hal_stdtypes.h"
 
-// ********** build switches **********
-
-#ifndef _VECTORCAST_
-//    #define RM46_EVAL_BOARD_TARGET          1
-//    #define BREADBOARD2_TARGET              1
-//    #define SIMULATE_UI                     1
-//    #define DEBUG_ENABLED                   1
-//    #define DISABLE_CRC_ERROR               1
-//    #define DISABLE_MOTOR_CURRENT_ERRORS    1
-//    #define SHOW_RAW_FLOW_VALUES            1
-//    #define CAN_TEST                        1
-
-    #ifdef DEBUG_ENABLED
-        #include <stdio.h>
-        #include <strings.h>
-    #endif
-#endif
-//#define UF_TEST_ENABLED                 1
-
 /**
  *  @defgroup CommonHeader CommonHeader
  *  @brief Provides commonly used definitions and macros.
@@ -190,17 +171,12 @@
     #define _enable_IRQ()
     #define _disable_IRQ()
     #define _enable_FIQ()
-    #ifndef _MINGW_
-        #pragma WEAK(can1LowLevelInterrupt)
-            void can1LowLevelInterrupt(void) {}
-        #pragma WEAK(can1HighLevelInterrupt)
-            void can1HighLevelInterrupt(void) {}
-    #endif
+    #define _disable_FIQ()
     #define fabs(v)     ((v) < 0.0 ? ((v) * -1.0) : (v))
 
 #endif
 
-// include alarm mgmt header
+// include alarm mgmt header so any module can trigger an alarm
 #include "AlarmMgmt.h"
 
 // include test support definitions and macros