diff --git a/src/V3File.cpp b/src/V3File.cpp
index 285ba5dbf..43c07ac17 100644
--- a/src/V3File.cpp
+++ b/src/V3File.cpp
@@ -692,7 +692,7 @@ int V3OutFormatter::endLevels(const char* strg) {
 }
 
 void V3OutFormatter::puts(const char* strg) {
-    if (m_prependIndent) {
+    if (m_prependIndent && strg[0] != '\n') {
         putsNoTracking(indentSpaces(endLevels(strg)));
         m_prependIndent = false;
     }
diff --git a/test_regress/t/t_debug_emitv.out b/test_regress/t/t_debug_emitv.out
index e37daa2fd..aeee81350 100644
--- a/test_regress/t/t_debug_emitv.out
+++ b/test_regress/t/t_debug_emitv.out
@@ -45,7 +45,7 @@ module Vt_debug_emitv;
         $display("stmt");
         $display("stmt");
     end
-    
+
     ???? // CFUNC '_final_TOP'
     $_CSTMT(Vt_debug_emitv* const __restrict vlTOPp VL_ATTR_UNUSED = vlSymsp->TOPp;
     );
diff --git a/test_regress/t/t_dpi_arg_inout_type__Dpi.out b/test_regress/t/t_dpi_arg_inout_type__Dpi.out
index 3f0f7e242..01379ddcd 100644
--- a/test_regress/t/t_dpi_arg_inout_type__Dpi.out
+++ b/test_regress/t/t_dpi_arg_inout_type__Dpi.out
@@ -10,8 +10,8 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
- 
- 
+
+
  // DPI EXPORTS
  extern void e_array_2_state_1(svBitVecVal* x);
  extern void e_array_2_state_128(svBitVecVal* x);
@@ -79,7 +79,7 @@ extern "C" {
  extern void e_union_4_state_33(svLogicVecVal* x);
  extern void e_union_4_state_64(svLogicVecVal* x);
  extern void e_union_4_state_65(svLogicVecVal* x);
- 
+
  // DPI IMPORTS
  extern void check_exports();
  extern void i_array_2_state_1(svBitVecVal* x);
@@ -148,7 +148,7 @@ extern "C" {
  extern void i_union_4_state_33(svLogicVecVal* x);
  extern void i_union_4_state_64(svLogicVecVal* x);
  extern void i_union_4_state_65(svLogicVecVal* x);
- 
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/test_regress/t/t_dpi_arg_inout_unpack__Dpi.out b/test_regress/t/t_dpi_arg_inout_unpack__Dpi.out
index 918872073..e4f0d5949 100644
--- a/test_regress/t/t_dpi_arg_inout_unpack__Dpi.out
+++ b/test_regress/t/t_dpi_arg_inout_unpack__Dpi.out
@@ -10,8 +10,8 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
- 
- 
+
+
  // DPI EXPORTS
  extern void e_bit121_0d(svBitVecVal* val);
  extern void e_bit121_1d(svBitVecVal* val);
@@ -93,7 +93,7 @@ extern "C" {
  extern void e_time_1d(svLogicVecVal* val);
  extern void e_time_2d(svLogicVecVal* val);
  extern void e_time_3d(svLogicVecVal* val);
- 
+
  // DPI IMPORTS
  extern void check_exports();
  extern void* get_non_null();
@@ -177,7 +177,7 @@ extern "C" {
  extern void i_time_1d(svLogicVecVal* val);
  extern void i_time_2d(svLogicVecVal* val);
  extern void i_time_3d(svLogicVecVal* val);
- 
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/test_regress/t/t_dpi_arg_input_type__Dpi.out b/test_regress/t/t_dpi_arg_input_type__Dpi.out
index ea56ffe00..632b44b9c 100644
--- a/test_regress/t/t_dpi_arg_input_type__Dpi.out
+++ b/test_regress/t/t_dpi_arg_input_type__Dpi.out
@@ -10,8 +10,8 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
- 
- 
+
+
  // DPI EXPORTS
  extern void e_array_2_state_1(const svBitVecVal* i);
  extern void e_array_2_state_128(const svBitVecVal* i);
@@ -79,7 +79,7 @@ extern "C" {
  extern void e_union_4_state_33(const svLogicVecVal* i);
  extern void e_union_4_state_64(const svLogicVecVal* i);
  extern void e_union_4_state_65(const svLogicVecVal* i);
- 
+
  // DPI IMPORTS
  extern void check_exports();
  extern void i_array_2_state_1(const svBitVecVal* i);
@@ -148,7 +148,7 @@ extern "C" {
  extern void i_union_4_state_33(const svLogicVecVal* i);
  extern void i_union_4_state_64(const svLogicVecVal* i);
  extern void i_union_4_state_65(const svLogicVecVal* i);
- 
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/test_regress/t/t_dpi_arg_input_unpack__Dpi.out b/test_regress/t/t_dpi_arg_input_unpack__Dpi.out
index f6eee80e8..0867d13f0 100644
--- a/test_regress/t/t_dpi_arg_input_unpack__Dpi.out
+++ b/test_regress/t/t_dpi_arg_input_unpack__Dpi.out
@@ -10,8 +10,8 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
- 
- 
+
+
  // DPI EXPORTS
  extern void e_bit121_0d(const svBitVecVal* val);
  extern void e_bit121_1d(const svBitVecVal* val);
@@ -93,7 +93,7 @@ extern "C" {
  extern void e_time_1d(const svLogicVecVal* val);
  extern void e_time_2d(const svLogicVecVal* val);
  extern void e_time_3d(const svLogicVecVal* val);
- 
+
  // DPI IMPORTS
  extern void check_exports();
  extern void* get_non_null();
@@ -177,7 +177,7 @@ extern "C" {
  extern void i_time_1d(const svLogicVecVal* val);
  extern void i_time_2d(const svLogicVecVal* val);
  extern void i_time_3d(const svLogicVecVal* val);
- 
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/test_regress/t/t_dpi_arg_output_type__Dpi.out b/test_regress/t/t_dpi_arg_output_type__Dpi.out
index f2bc7f4c6..1a9db977f 100644
--- a/test_regress/t/t_dpi_arg_output_type__Dpi.out
+++ b/test_regress/t/t_dpi_arg_output_type__Dpi.out
@@ -10,8 +10,8 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
- 
- 
+
+
  // DPI EXPORTS
  extern void e_array_2_state_1(svBitVecVal* o);
  extern void e_array_2_state_128(svBitVecVal* o);
@@ -79,7 +79,7 @@ extern "C" {
  extern void e_union_4_state_33(svLogicVecVal* o);
  extern void e_union_4_state_64(svLogicVecVal* o);
  extern void e_union_4_state_65(svLogicVecVal* o);
- 
+
  // DPI IMPORTS
  extern void check_exports();
  extern void i_array_2_state_1(svBitVecVal* o);
@@ -148,7 +148,7 @@ extern "C" {
  extern void i_union_4_state_33(svLogicVecVal* o);
  extern void i_union_4_state_64(svLogicVecVal* o);
  extern void i_union_4_state_65(svLogicVecVal* o);
- 
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/test_regress/t/t_dpi_arg_output_unpack__Dpi.out b/test_regress/t/t_dpi_arg_output_unpack__Dpi.out
index e3a2729a4..24675921e 100644
--- a/test_regress/t/t_dpi_arg_output_unpack__Dpi.out
+++ b/test_regress/t/t_dpi_arg_output_unpack__Dpi.out
@@ -10,8 +10,8 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
- 
- 
+
+
  // DPI EXPORTS
  extern void e_bit121_0d(svBitVecVal* val);
  extern void e_bit121_1d(svBitVecVal* val);
@@ -93,7 +93,7 @@ extern "C" {
  extern void e_time_1d(svLogicVecVal* val);
  extern void e_time_2d(svLogicVecVal* val);
  extern void e_time_3d(svLogicVecVal* val);
- 
+
  // DPI IMPORTS
  extern void check_exports();
  extern void* get_non_null();
@@ -177,7 +177,7 @@ extern "C" {
  extern void i_time_1d(svLogicVecVal* val);
  extern void i_time_2d(svLogicVecVal* val);
  extern void i_time_3d(svLogicVecVal* val);
- 
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/test_regress/t/t_dpi_result_type__Dpi.out b/test_regress/t/t_dpi_result_type__Dpi.out
index e5d541f43..cd2d0ecc8 100644
--- a/test_regress/t/t_dpi_result_type__Dpi.out
+++ b/test_regress/t/t_dpi_result_type__Dpi.out
@@ -10,8 +10,8 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
- 
- 
+
+
  // DPI EXPORTS
  extern svBitVecVal e_array_2_state_1();
  extern svBitVecVal e_array_2_state_32();
@@ -46,7 +46,7 @@ extern "C" {
  extern svBitVecVal e_union_2_state_1();
  extern svBitVecVal e_union_2_state_32();
  extern void e_void();
- 
+
  // DPI IMPORTS
  extern void check_exports();
  extern svBitVecVal i_array_2_state_1();
@@ -82,7 +82,7 @@ extern "C" {
  extern svBitVecVal i_union_2_state_1();
  extern svBitVecVal i_union_2_state_32();
  extern void i_void();
- 
+
 #ifdef __cplusplus
 }
 #endif