diff --git a/src/generators/comba_sqr_gen.c b/src/generators/comba_sqr_gen.c
index a949294..a5a8ed1 100644
--- a/src/generators/comba_sqr_gen.c
+++ b/src/generators/comba_sqr_gen.c
@@ -16,10 +16,16 @@ int main(int argc, char **argv)
    N = atoi(argv[1]);
 
 printf(
+"#define TFM_DEFINES\n"
+"#include \"fp_sqr_comba.c\"\n"
+"\n"
 "#ifdef TFM_SQR%d\n"
 "void fp_sqr_comba%d(fp_int *A, fp_int *B)\n"
 "{\n"
 "   fp_digit *a, b[%d], c0, c1, c2, sc0, sc1, sc2;\n"
+"#ifdef TFM_ISO\n"
+"   fp_word tt;\n"
+"#endif\n"
 "\n"
 "   a = A->dp;\n"
 "   COMBA_START; \n"
diff --git a/src/generators/comba_sqr_smallgen.c b/src/generators/comba_sqr_smallgen.c
index d8d62fe..f4718f0 100644
--- a/src/generators/comba_sqr_smallgen.c
+++ b/src/generators/comba_sqr_smallgen.c
@@ -16,9 +16,16 @@ int main(int argc, char **argv)
    int x, y, z, N, f;
 
 printf(
+"#define TFM_DEFINES\n"
+"#include \"fp_sqr_comba.c\"\n"
+"\n"
+"#if defined(TFM_SMALL_SET)\n"
 "void fp_sqr_comba_small(fp_int *A, fp_int *B)\n"
 "{\n"
 "   fp_digit *a, b[32], c0, c1, c2, sc0, sc1, sc2;\n"
+"#ifdef TFM_ISO\n"
+"   fp_word tt;\n"
+"#endif\n"
 );
 
 printf("   switch (A->used) { \n");
@@ -100,7 +107,7 @@ printf(
 "      break;\n\n", N+N, N+N, N+N, N+N);
 }
 
-printf("}\n\n}\n");
+printf("}\n}\n\n#endif /* TFM_SMALL_SET */\n");
 
   return 0;
 }