--- a/ti_dl/utils/tidlModelImport/tidl_import_common.cpp	2022-12-20 00:04:27.000000000 +0000
+++ b/ti_dl/utils/tidlModelImport/tidl_import_common.cpp	2023-04-20 13:43:38.551355435 +0100
@@ -474,8 +474,8 @@
 void TIDL_UpdateInDataNameInLayers(sTIDL_OrgNetwork_t * pOrgTIDLNetStructure,
   uint32_t numLayers, char * currName , char * newName, std::vector<int32_t>& layers)
 {
-  int32_t i, j;
-  for (i : layers)
+  int32_t j;
+  for (int32_t i : layers)
   {
     for (j = 0; j < pOrgTIDLNetStructure->TIDLPCLayers[i].numInBufs; j++)
     {
@@ -950,8 +950,8 @@
   uint32_t numLayers, sTIDL_DataParams_t dataBuf,  sTIDL_DataParams_t newDataBuf,
   std::vector<int32_t>& layers)
 {
-  int32_t i, j;
-  for (i : layers)
+  int32_t j;
+  for (int32_t i : layers)
   {
     for (j = 0; (j < pOrgTIDLNetStructure->TIDLPCLayers[i].numInBufs) &&
       (pOrgTIDLNetStructure->TIDLPCLayers[i].numInBufs > 0); j++)
@@ -8634,7 +8634,6 @@
 int32_t tidl_addUnStitchLayerForBatchProcessing(sTIDL_OrgNetwork_t  *pOrgTIDLNetStructure, int32_t * dataIndex,
         int32_t layerIndex, int32_t i1, std::vector<int32_t>& out_layers, int32_t *layerID)
 {
-  int32_t i2;
   char dataLayerName[10];
   pOrgTIDLNetStructure->TIDLPCLayers[layerIndex].layerType = TIDL_BatchReshapeLayer;
   pOrgTIDLNetStructure->TIDLPCLayers[layerIndex].numInBufs  = 1; //pOrgTIDLNetStructure->TIDLPCLayers[i1].numOutBufs;
@@ -8645,7 +8644,7 @@
   strcpy((char *)pOrgTIDLNetStructure->TIDLPCLayers[layerIndex].outDataNames[0], (char *)pOrgTIDLNetStructure->TIDLPCLayers[i1].outDataNames[0]);
   strcat((char *)pOrgTIDLNetStructure->TIDLPCLayers[i1].outDataNames[0], "_batchFormat");
   strcpy((char *)pOrgTIDLNetStructure->TIDLPCLayers[layerIndex].inDataNames[0], (char *)pOrgTIDLNetStructure->TIDLPCLayers[i1].outDataNames[0]);
-  for (i2 : out_layers)
+  for (int32_t i2 : out_layers)
   {
     strcpy((char *)pOrgTIDLNetStructure->TIDLPCLayers[i2].inDataNames[0], (char *)pOrgTIDLNetStructure->TIDLPCLayers[layerIndex].outDataNames[0]);
   }
@@ -8719,7 +8718,7 @@
 */
 int32_t tidl_addBatchReshapeLayerForBatchProcessing(sTIDL_OrgNetwork_t  &pOrgTIDLNetStructure, int32_t * dataIndex, int32_t layerIndex, int32_t *layerID, int32_t *batchPadTotal)
 {
-  int32_t i1, i2, i3, i4;
+  int32_t i1, i2, i4;
   char dataLayerName[10];
   int32_t status = 0;
   int32_t lyrAdded = 0;
@@ -8738,7 +8737,7 @@
         {
           std::vector<int32_t> out_layers = tidl_getOutLayers(pOrgTIDLNetStructure, layerIndex, pOrgTIDLNetStructure.TIDLPCLayers[i1].inData[i2].dataId);
           std::vector<int32_t> out_layers_support_stitching;
-          for (i3 : out_layers)
+          for (int32_t i3 : out_layers)
           {
             if (TIDL_doesLayerSupportBatchProcessing(&pOrgTIDLNetStructure.TIDLPCLayers[i3]) == 1)
             {
@@ -8781,7 +8780,7 @@
         if (out_layers.size() == 0)
           return -1;
         std::vector<int32_t> out_layers_donot_support_stitching;
-        for (i3 : out_layers)
+        for (int32_t i3 : out_layers)
         {
           sTIDL_LayerPC_t &TIDLPCOutLayers = pOrgTIDLNetStructure.TIDLPCLayers[i3];
           if ((TIDLPCOutLayers.layerType != TIDL_BatchReshapeLayer) &&