--- a/gsm-fw/g23m-aci/aci/cmh_ssf.c	Sun Apr 05 00:38:21 2015 +0000
+++ b/gsm-fw/g23m-aci/aci/cmh_ssf.c	Sun Apr 05 03:56:11 2015 +0000
@@ -21,6 +21,12 @@
 #ifndef CMH_SSF_C
 #define CMH_SSF_C
 #endif
+
+#include "config.h"
+#include "fixedconf.h"
+#include "condat-features.h"
+#include "aci_conf.h"
+
 #include "aci_all.h"
 /*==== INCLUDES ===================================================*/
 #include "aci_cmh.h"
@@ -57,6 +63,13 @@
 #include "phb.h"
 #include "aci_ext_pers.h"
 
+/*
+ * FreeCalypso hack: gcc is complaining about integer/pointer mix violations
+ * with regard to NULL being used in integer contexts, so we are going to
+ * silence it as follows:
+ */
+#undef NULL
+#define	NULL	0
 
 /*==== CONSTANTS ==================================================*/
 #ifdef SIM_TOOLKIT