diff --git a/libasn1compiler/asn1c_C.c b/libasn1compiler/asn1c_C.c
index d97d246..5615328 100644
--- a/libasn1compiler/asn1c_C.c
+++ b/libasn1compiler/asn1c_C.c
@@ -920,7 +920,7 @@
 			&& (terminal->expr_type & ASN_CONSTR_MASK)) {
 				tnfmt = TNF_RSAFE;
 				REDIR(OT_FWD_DECLS);
-				OUT("%s;\t/* Forward declaration */\n",
+				OUT("%s;\n",
 					asn1c_type_name(arg, arg->expr, tnfmt));
 			}
 		}
@@ -1569,7 +1569,7 @@
 				&& (terminal->expr_type & ASN_CONSTR_MASK)) {
 				int saved_target = arg->target->target;
 				REDIR(OT_FWD_DECLS);
-				OUT("%s;\t/* Forward declaration */\n",
+				OUT("%s;\n",
 					asn1c_type_name(arg, memb, TNF_RSAFE));
 				REDIR(saved_target);
 				memb->marker.flags |= EM_UNRECURSE;
diff --git a/tests/19-param-OK.asn1.-P b/tests/19-param-OK.asn1.-P
index 85f3f05..dab887e 100644
--- a/tests/19-param-OK.asn1.-P
+++ b/tests/19-param-OK.asn1.-P
@@ -196,7 +196,7 @@
 
 /*** <<< FWD-DECLS [Name] >>> ***/
 
-struct RelativeDistinguishedName;	/* Forward declaration */
+struct RelativeDistinguishedName;
 
 /*** <<< TYPE-DECLS [Name] >>> ***/
 
diff --git a/tests/31-set-of-OK.asn1.-P b/tests/31-set-of-OK.asn1.-P
index b1bdd78..70af42b 100644
--- a/tests/31-set-of-OK.asn1.-P
+++ b/tests/31-set-of-OK.asn1.-P
@@ -6,7 +6,7 @@
 
 /*** <<< FWD-DECLS [Forest] >>> ***/
 
-struct Tree;	/* Forward declaration */
+struct Tree;
 
 /*** <<< TYPE-DECLS [Forest] >>> ***/
 
@@ -171,7 +171,7 @@
 
 /*** <<< FWD-DECLS [Stuff] >>> ***/
 
-struct Forest;	/* Forward declaration */
+struct Forest;
 
 /*** <<< TYPE-DECLS [Stuff] >>> ***/
 
diff --git a/tests/32-sequence-of-OK.asn1.-P b/tests/32-sequence-of-OK.asn1.-P
index 0c77d8b..9d4a445 100644
--- a/tests/32-sequence-of-OK.asn1.-P
+++ b/tests/32-sequence-of-OK.asn1.-P
@@ -6,7 +6,7 @@
 
 /*** <<< FWD-DECLS [Programming] >>> ***/
 
-struct Fault;	/* Forward declaration */
+struct Fault;
 
 /*** <<< TYPE-DECLS [Programming] >>> ***/
 
@@ -74,7 +74,7 @@
 
 /*** <<< FWD-DECLS [Fault] >>> ***/
 
-struct Error;	/* Forward declaration */
+struct Error;
 
 /*** <<< TYPE-DECLS [Fault] >>> ***/
 
diff --git a/tests/39-sequence-of-OK.asn1.-P b/tests/39-sequence-of-OK.asn1.-P
index f564b2e..7f5fe9e 100644
--- a/tests/39-sequence-of-OK.asn1.-P
+++ b/tests/39-sequence-of-OK.asn1.-P
@@ -8,7 +8,7 @@
 
 /*** <<< FWD-DECLS [T] >>> ***/
 
-struct T2;	/* Forward declaration */
+struct T2;
 
 /*** <<< TYPE-DECLS [T] >>> ***/
 
diff --git a/tests/42-real-life-OK.asn1.-PR b/tests/42-real-life-OK.asn1.-PR
index 7dfb845..e6e5dc3 100644
--- a/tests/42-real-life-OK.asn1.-PR
+++ b/tests/42-real-life-OK.asn1.-PR
@@ -8,7 +8,7 @@
 
 /*** <<< FWD-DECLS [LogLine] >>> ***/
 
-struct VariablePartSet;	/* Forward declaration */
+struct VariablePartSet;
 
 /*** <<< TYPE-DECLS [LogLine] >>> ***/
 
@@ -174,7 +174,7 @@
 
 /*** <<< FWD-DECLS [VariablePartSet] >>> ***/
 
-struct VariablePart;	/* Forward declaration */
+struct VariablePart;
 
 /*** <<< TYPE-DECLS [VariablePartSet] >>> ***/
 
diff --git a/tests/43-recursion-OK.asn1.-P b/tests/43-recursion-OK.asn1.-P
index 747d962..0c56aa8 100644
--- a/tests/43-recursion-OK.asn1.-P
+++ b/tests/43-recursion-OK.asn1.-P
@@ -10,7 +10,7 @@
 
 /*** <<< FWD-DECLS [Test-structure-1] >>> ***/
 
-struct Test_structure_1;	/* Forward declaration */
+struct Test_structure_1;
 
 /*** <<< TYPE-DECLS [Test-structure-1] >>> ***/
 
@@ -214,7 +214,7 @@
 
 /*** <<< FWD-DECLS [Choice-1] >>> ***/
 
-struct Choice_1;	/* Forward declaration */
+struct Choice_1;
 
 /*** <<< TYPE-DECLS [Choice-1] >>> ***/
 
@@ -369,7 +369,7 @@
 
 /*** <<< FWD-DECLS [Test-structure-2] >>> ***/
 
-struct Test_structure_3;	/* Forward declaration */
+struct Test_structure_3;
 
 /*** <<< TYPE-DECLS [Test-structure-2] >>> ***/
 
@@ -462,7 +462,7 @@
 
 /*** <<< FWD-DECLS [Test-structure-3] >>> ***/
 
-struct Test_structure_2;	/* Forward declaration */
+struct Test_structure_2;
 
 /*** <<< TYPE-DECLS [Test-structure-3] >>> ***/
 
diff --git a/tests/59-choice-extended-OK.asn1.-P b/tests/59-choice-extended-OK.asn1.-P
index 12f7be4..391cbca 100644
--- a/tests/59-choice-extended-OK.asn1.-P
+++ b/tests/59-choice-extended-OK.asn1.-P
@@ -17,7 +17,7 @@
 
 /*** <<< FWD-DECLS [Choice] >>> ***/
 
-struct Choice;	/* Forward declaration */
+struct Choice;
 
 /*** <<< TYPE-DECLS [Choice] >>> ***/
 
diff --git a/tests/70-xer-test-OK.asn1.-P b/tests/70-xer-test-OK.asn1.-P
index e84e9f7..89dc618 100644
--- a/tests/70-xer-test-OK.asn1.-P
+++ b/tests/70-xer-test-OK.asn1.-P
@@ -173,7 +173,7 @@
 
 /*** <<< FWD-DECLS [Sequence] >>> ***/
 
-struct Sequence;	/* Forward declaration */
+struct Sequence;
 
 /*** <<< TYPE-DECLS [Sequence] >>> ***/
 
diff --git a/tests/73-circular-OK.asn1.-P b/tests/73-circular-OK.asn1.-P
index 837f6f7..d851ff0 100644
--- a/tests/73-circular-OK.asn1.-P
+++ b/tests/73-circular-OK.asn1.-P
@@ -7,7 +7,7 @@
 
 /*** <<< FWD-DECLS [Type] >>> ***/
 
-struct Epyt;	/* Forward declaration */
+struct Epyt;
 
 /*** <<< TYPE-DECLS [Type] >>> ***/
 
@@ -245,8 +245,8 @@
 
 /*** <<< FWD-DECLS [Epyt] >>> ***/
 
-struct Type;	/* Forward declaration */
-struct Ypet;	/* Forward declaration */
+struct Type;
+struct Ypet;
 
 /*** <<< TYPE-DECLS [Epyt] >>> ***/