diff --git a/os/common/oop/codegen/oop_sequential_stream.xml b/os/common/oop/codegen/oop_sequential_stream.xml
index 26d2a1e1f..38e5e05da 100644
--- a/os/common/oop/codegen/oop_sequential_stream.xml
+++ b/os/common/oop/codegen/oop_sequential_stream.xml
@@ -11,6 +11,13 @@
       <include style="regular">oop_base_interface.h</include>
     </includes>
     <definitions_early>
+      <verbatim><![CDATA[
+/* Temporary, in order to avoid conflicts with the same definitions in old
+   HAL streams.*/
+#undef STM_OK
+#undef STM_TIMEOUT
+#undef STM_RESET
+]]></verbatim>
       <group description="Streams return codes">
         <define name="STM_OK" value="0" >
           <brief>Returned code for operation successful.</brief>
diff --git a/os/common/oop/include/oop_sequential_stream.h b/os/common/oop/include/oop_sequential_stream.h
index 26cc59d70..a2857c897 100644
--- a/os/common/oop/include/oop_sequential_stream.h
+++ b/os/common/oop/include/oop_sequential_stream.h
@@ -33,6 +33,12 @@
 /* Module constants.                                                         */
 /*===========================================================================*/
 
+/* Temporary, in order to avoid conflicts with the same definitions in old
+   HAL streams.*/
+#undef STM_OK
+#undef STM_TIMEOUT
+#undef STM_RESET
+
 /**
  * @name    Streams return codes
  * @{
diff --git a/tools/ftl/libs/libccode.ftl b/tools/ftl/libs/libccode.ftl
index 1334df130..f6d64e361 100644
--- a/tools/ftl/libs/libccode.ftl
+++ b/tools/ftl/libs/libccode.ftl
@@ -314,7 +314,7 @@ ${s}
       [/#if]
     [#elseif this?node_name == "verbatim"]
       [#local ccode = (this[0]!"")?trim]
-[@GenerateIndentedCCode indent ccode /]
+[@GenerateIndentedCCode "" ccode /]
       [#if node?node_name?starts_with("definitions")]
 
       [/#if]