diff --git a/src/DynamicModel.cc b/src/DynamicModel.cc
index e94274195c9632817ec11a1fffa6d249b2c1b7a1..222a6877fa33c8a3cd558a6d5fbee0327b5b222f 100644
--- a/src/DynamicModel.cc
+++ b/src/DynamicModel.cc
@@ -2604,19 +2604,16 @@ DynamicModel::writeDynamicModel(const string &dynamic_basename, ostream &Dynamic
 
       writeDynamicMatlabCompatLayer(dynamic_basename);
     }
-        /*
-
   else if (output_type == oCDynamicModel)
     {
       DynamicOutput << "void Dynamic(double *y, double *x, int nb_row_x, double *params, double *steady_state, int it_, double *residual, double *g1, double *v2, double *v3)" << endl
                     << "{" << endl
                     << "  double lhs, rhs;" << endl
                     << endl
-                    << "  * Residual equations *" << endl
-                    << model_local_vars_output.str()
+                    << "  /* Residual equations */" << endl
                     << model_tt_output.str()
                     << model_output.str()
-                    << "  * Jacobian  *" << endl
+                    << "  /* Jacobian  */" << endl
                     << "  if (g1 == NULL)" << endl
                     << "    return;" << endl
                     << endl
@@ -2625,7 +2622,7 @@ DynamicModel::writeDynamicModel(const string &dynamic_basename, ostream &Dynamic
                     << endl;
 
       if (second_derivatives.size())
-        DynamicOutput << "  * Hessian for endogenous and exogenous variables *" << endl
+        DynamicOutput << "  /* Hessian for endogenous and exogenous variables */" << endl
                       << "  if (v2 == NULL)" << endl
                       << "    return;" << endl
                       << endl
@@ -2634,7 +2631,7 @@ DynamicModel::writeDynamicModel(const string &dynamic_basename, ostream &Dynamic
                       << endl;
 
       if (third_derivatives.size())
-        DynamicOutput << "  * Third derivatives for endogenous and exogenous variables *" << endl
+        DynamicOutput << "  /* Third derivatives for endogenous and exogenous variables */" << endl
                       << "  if (v3 == NULL)" << endl
                       << "    return;" << endl
                       << endl
@@ -2644,7 +2641,6 @@ DynamicModel::writeDynamicModel(const string &dynamic_basename, ostream &Dynamic
 
       DynamicOutput << "}" << endl << endl;
     }
-        */
   else
     {
       string filename =  dynamic_basename + "Dynamic.jl";
diff --git a/src/StaticModel.cc b/src/StaticModel.cc
index e90b2ff4642db5da2e692f11395748337c32d16e..6d0df06a8d0a668ea328d86941069c6b25bc0da8 100644
--- a/src/StaticModel.cc
+++ b/src/StaticModel.cc
@@ -1632,36 +1632,37 @@ StaticModel::writeStaticModel(const string &basename,
     }
   else if (output_type == oCStaticModel)
     {
-      /*
       StaticOutput << "void Static(double *y, double *x, int nb_row_x, double *params, double *residual, double *g1, double *v2)" << endl
                    << "{" << endl
                    << "  double lhs, rhs;" << endl
                    << endl
-                   << "  * Residual equations *" << endl
-                   << model_local_vars_output.str()
+                   << "  /* Residual equations */" << endl
+                   << model_tt_output.str()
                    << model_output.str()
-                   << "  * Jacobian  *" << endl
+                   << "  /* Jacobian  */" << endl
                    << "  if (g1 == NULL)" << endl
                    << "    return;" << endl
                    << endl
+                   << jacobian_tt_output.str()
                    << jacobian_output.str()
                    << endl;
 
       if (second_derivatives.size())
-        StaticOutput << "  * Hessian for endogenous and exogenous variables *" << endl
+        StaticOutput << "  /* Hessian for endogenous and exogenous variables */" << endl
                      << "  if (v2 == NULL)" << endl
                      << "    return;" << endl
                      << endl
+                     << hessian_tt_output.str()
                      << hessian_output.str()
                      << endl;
       if (third_derivatives.size())
-        StaticOutput << "  * Third derivatives for endogenous and exogenous variables *" << endl
+        StaticOutput << "  /* Third derivatives for endogenous and exogenous variables */" << endl
                      << "  if (v3 == NULL)" << endl
                      << "    return;" << endl
                      << endl
+                     << third_derivatives_tt_output.str()
                      << third_derivatives_output.str()
                      << endl;
-      */
     }
   else
     {