--- a/gsm-fw/services/ffs/task.c	Mon Jan 06 08:43:35 2014 +0000
+++ b/gsm-fw/services/ffs/task.c	Mon Jan 06 20:24:53 2014 +0000
@@ -13,6 +13,7 @@
 #include "core.h"
 #include "task.h"
 #include "ffstrace.h" 
+#include "intctl.h"
 #include "../../riviera/rvm/rvm_use_id_list.h"
 
 /******************************************************************************
@@ -113,18 +114,16 @@
 
 req_id_t request_id_get(void)
 {
-    extern uint32 int_disable(void);
-    extern void int_enable(uint32 tmp);
-    uint32 cprs;
+    uint32 cpsr;
 
     // We disable interrupt to avoid any other tasks to get the same id.
-    cprs = int_disable();
+    cpsr = int_disable();
     request_id_last++;
 
     if (request_id_last < 0)
         request_id_last = 0;
 
-    int_enable(cprs);
+    int_enable(cpsr);
 
     return request_id_last;
 }