--- a/libgsmefr/d1035pf.c	Fri Nov 25 19:18:50 2022 +0000
+++ b/libgsmefr/d1035pf.c	Fri Nov 25 19:22:05 2022 +0000
@@ -9,9 +9,13 @@
  *
  *************************************************************************/
 
+#include "gsm_efr.h"
 #include "typedef.h"
+#include "namespace.h"
 #include "basic_op.h"
-#include "count.h"
+#include "memops.h"
+#include "no_count.h"
+#include "codec.h"
 
 #define L_CODE    40            /* codevector length */
 #define NB_PULSE  10            /* number of pulses  */
@@ -25,10 +29,7 @@
     static const Word16 dgray[8] = {0, 1, 3, 2, 5, 6, 4, 7};
     Word16 i, j, pos1, pos2, sign, tmp;
 
-    for (i = 0; i < L_CODE; i++)
-    {
-        cod[i] = 0;                                     move16 (); 
-    }
+    Set_zero (cod, L_CODE);
 
     /* decode the positions and signs of pulses and build the codeword */
 
@@ -44,7 +45,6 @@
         pos1 = add (i, j); /* position of pulse "j" */
 
         i = shr (tmp, 3) & 1;                           logic16 (); 
-        test (); 
         if (i == 0)
         {
             sign = 4096;                                move16 (); /* +1.0 */
@@ -64,7 +64,6 @@
 
         pos2 = add (i, j);      /* position of pulse "j+5" */
 
-        test (); 
         if (sub (pos2, pos1) < 0)
         {
             sign = negate (sign);