--- a/libgsmhr1/sp_frm.h	Thu Mar 05 17:53:42 2026 +0000
+++ b/libgsmhr1/sp_frm.h	Thu Mar 05 19:48:10 2026 +0000
@@ -21,6 +21,44 @@
  |_________________________________________________________________________|
 */
 
+void aflat(struct gsmhr_encoder_state *st, Shortword pswSpeechToLPC[],
+	   int piR0Index[], Shortword pswFinalRc[], int piVQCodewds[],
+	   Shortword swPtch, Shortword *pswVadFlag, Shortword *pswSP);
+
+Shortword aflatRecursion(struct gsmhr_encoder_state *st, Shortword pswQntRc[],
+			 Shortword pswPBar[], Shortword pswVBar[],
+			 Shortword *ppswPAddrs[], Shortword *ppswVAddrs[],
+			 Shortword swSegmentOrder);
+
+void getSfrmLpcTx(struct gsmhr_encoder_state *st, Shortword swPrevR0,
+		  Shortword swNewR0,
+		  /* last frm*/
+		  Shortword pswPrevFrmKs[], Shortword pswPrevFrmAs[],
+		  Shortword pswPrevFrmSNWCoef[],
+		  /* this frm*/
+		  Shortword pswNewFrmKs[], Shortword pswNewFrmAs[],
+		  Shortword pswNewFrmSNWCoef[], Shortword pswHPFSpeech[],
+		  /* output */
+		  short *pswSoftInterp, struct NormSw *psnsSqrtRs,
+		  Shortword ppswSynthAs[][NP], Shortword ppswSNWCoefAs[][NP]);
+
+short compResidEnergy(struct gsmhr_encoder_state *st, Shortword pswSpeech[],
+			Shortword ppswInterpCoef[][NP],
+			Shortword pswPreviousCoef[],
+			Shortword pswCurrentCoef[],
+			struct NormSw psnsSqrtRs[]);
+
+void getNextVec(struct gsmhr_encoder_state *st, Shortword pswRc[]);
+
+void setupPreQ(struct gsmhr_encoder_state *st, int iSeg, int iVector);
+
+void setupQuant(struct gsmhr_encoder_state *st, int iSeg, int iVector);
+
+void weightSpeechFrame(struct gsmhr_encoder_state *st,
+			Shortword pswSpeechFrm[],
+			Shortword pswWNumSpace[], Shortword pswWDenomSpace[],
+			Shortword pswWSpeechBuffBase[]);
+
 void   iir_d(Shortword pswCoeff[], Shortword pswIn[],
                     Shortword pswXstate[],
                     Shortword pswYstate[],
@@ -44,13 +82,6 @@
                                       Longword pL_PBarFull[],
                                       Longword pL_VBarFull[]);
 
-  Shortword aflatRecursion(Shortword pswQntRc[],
-                                  Shortword pswPBar[],
-                                  Shortword pswVBar[],
-                                  Shortword *ppswPAddrs[],
-                                  Shortword *ppswVAddrs[],
-                                  Shortword swSegmentOrder);
-
   void   aflatNewBarRecursionL(Shortword pswQntRc[],
                                       int iSegment,
                                       Longword pL_PBar[],
@@ -59,55 +90,16 @@
                                       Shortword pswVBar[]);
 
 
-  void   setupPreQ(int iSeg, int iVector);
-
-  void   setupQuant(int iSeg, int iVector);
-
-  void   getNextVec(Shortword pswRc[]);
-
-  void   aflat(Shortword pswSpeechToLPC[],
-                      int piR0Index[],
-                      Shortword pswFinalRc[],
-                      int piVQCodewds[],
-                      Shortword swPtch,
-                      Shortword *pswVadFlag,
-                      Shortword *pswSP);
-
-
   Shortword fnExp2(Longword L_Input);
 
   Shortword fnLog2(Longword L_Input);
 
-  void   weightSpeechFrame(Shortword pswSpeechFrm[],
-                                  Shortword pswWNumSpace[],
-                                  Shortword pswWDenomSpace[],
-                                  Shortword pswWSpeechBuffBase[]);
-
-  void   getSfrmLpcTx(Shortword swPrevR0, Shortword swNewR0,
-                             Shortword pswPrevFrmKs[],
-                             Shortword pswPrevFrmAs[],
-                             Shortword pswPrevFrmSNWCoef[],
-                             Shortword pswNewFrmKs[],
-                             Shortword pswNewFrmAs[],
-                             Shortword pswNewFrmSNWCoef[],
-                             Shortword pswHPFSpeech[],
-                             short *pswSoftInterp,
-                             struct NormSw *psnsSqrtRs,
-                             Shortword ppswSynthAs[][NP],
-                             Shortword ppswSNWCoefAs[][NP]);
-
   short int fnBest_CG(Shortword pswCframe[],
                              Shortword pswGframe[],
                              Shortword *pswCmaxSqr,
                              Shortword *pswGmax,
                              short int siNumPairs);
 
-  short  compResidEnergy(Shortword pswSpeech[],
-                                Shortword ppswInterpCoef[][NP],
-                                Shortword pswPreviousCoef[],
-                                Shortword pswCurrentCoef[],
-                                struct NormSw psnsSqrtRs[]);
-
   Shortword r0Quant(Longword L_UnqntzdR0);
 
   Shortword cov32(Shortword pswIn[],