Revert "param parsing: cleaned generated file includes, flagged things as unused"

This reverts commit 420fd33.

Author: t8m

util/perl/OpenSSL/paramnames.pm

@@ -17,7 +17,6 @@ our @EXPORT_OK = qw(generate_public_macros
                     produce_param_decoder
                     produce_param_decoder_with_count);
 
-our $headers_included = 0;
 my $case_sensitive = 1;
 my $need_break = 0;
 my $invalid_param = "invalid param";
@@ -865,21 +864,16 @@ sub output_param_decoder {
     my %concat_num = ();
     my %ifdefs = ();
 
-    if (!$headers_included) {
-        $headers_included = 1;
-        print "/* Machine generated by util/perl/OpenSSL/paramnames.pm */\n";
-        # IWYU
-        print "#include <string.h>\n";
-        print "#include <openssl/params.h>\n";
-        print "#include <openssl/e_os2.h>\n";
-        print "#include \"internal/common.h\"\n";
-        print "#include \"prov/proverr.h\"\n";
-        print "\n";
-    }
-    print "/* Machine generated */\n";
+    print "/* Machine generated by util/perl/OpenSSL/paramnames.pm */\n";
+    # IWYU
+    print "#include <string.h>\n";
+    print "#include <openssl/params.h>\n";
+    print "#include \"internal/common.h\"\n";
+    print "#include \"prov/proverr.h\"\n";
+    print "\n";
     # Output gettable param array
     printf "#ifndef %s_list\n", $decoder_name_base;
-    printf "static ossl_unused const OSSL_PARAM %s_list[] = {\n", $decoder_name_base;
+    printf "static const OSSL_PARAM %s_list[] = {\n", $decoder_name_base;
     for (my $i = 0; $i <= $#params; $i++) {
         my $pname = $params[$i][0];
         my $pident = $params[$i][1];
@@ -950,7 +944,7 @@ sub output_param_decoder {
     locate_long_endings(\%t);
 
     printf "#ifndef %s_decoder\n", $decoder_name_base;
-    printf "static ossl_unused int %s_decoder\n", $decoder_name_base;
+    printf "static int %s_decoder\n", $decoder_name_base;
     printf "    (const OSSL_PARAM *p, struct %s_st *r", $decoder_name_base;
     printf "%s)\n", ($with_count ? ", int *count" : "");
     print "{\n";