diff --git a/cpukit/score/cpu/bfin/rtems/score/cpu.h b/cpukit/score/cpu/bfin/rtems/score/cpu.h
index b0e82fe8e6..881c063458 100644
--- a/cpukit/score/cpu/bfin/rtems/score/cpu.h
+++ b/cpukit/score/cpu/bfin/rtems/score/cpu.h
@@ -1036,7 +1036,7 @@ void _CPU_Context_Initialize(
  */
 #define _CPU_Context_Initialize_fp( _destination ) \
   { \
-   *((Context_Control_fp *) *((void **) _destination)) = _CPU_Null_fp_context; \
+   *(*(_destination)) = _CPU_Null_fp_context; \
   }
 
 /* end of Context handler macros */
@@ -1330,7 +1330,7 @@ void _CPU_Context_restore(
  *  XXX document implementation including references if appropriate
  */
 void _CPU_Context_save_fp(
-  void **fp_context_ptr
+  Context_Control_fp **fp_context_ptr
 );
 
 /**
@@ -1348,7 +1348,7 @@ void _CPU_Context_save_fp(
  *  XXX document implementation including references if appropriate
  */
 void _CPU_Context_restore_fp(
-  void **fp_context_ptr
+  Context_Control_fp **fp_context_ptr
 );
 
 /**
diff --git a/cpukit/score/cpu/c4x/rtems/score/cpu.h b/cpukit/score/cpu/c4x/rtems/score/cpu.h
index b268a44499..470cd5295f 100644
--- a/cpukit/score/cpu/c4x/rtems/score/cpu.h
+++ b/cpukit/score/cpu/c4x/rtems/score/cpu.h
@@ -940,7 +940,7 @@ void _CPU_Context_Initialize(
 
 #define _CPU_Context_Initialize_fp( _destination ) \
   do { \
-   *((Context_Control_fp *) *((void **) _destination)) = _CPU_Null_fp_context; \
+   *(*(_destination)) = _CPU_Null_fp_context; \
   } while (0)
 #endif
 
@@ -1191,7 +1191,7 @@ void _CPU_Context_restore(
 
 #if ( C4X_HAS_FPU == 1 )
 void _CPU_Context_save_fp(
-  void **fp_context_ptr
+  Context_Control_fp **fp_context_ptr
 );
 #endif
 
@@ -1207,7 +1207,7 @@ void _CPU_Context_save_fp(
 
 #if ( C4X_HAS_FPU == 1 )
 void _CPU_Context_restore_fp(
-  void **fp_context_ptr
+  Context_Control_fp **fp_context_ptr
 );
 #endif