src/jdk.jextract/share/classes/com/sun/tools/jextract/HeaderResolver.java

*** 48,65 ****
                  .map(Path::getParent)
                  .forEach(p -> usePackageForFolder(p, ctx.options.targetPackage));
          ctx.options.pkgMappings.forEach(this::usePackageForFolder);
      }
  
!     public String headerInterfaceName(String filename) {
          int ext = filename.lastIndexOf('.');
          String name = ext != -1 ? filename.substring(0, ext) : filename;
          return Utils.toClassName(name);
      }
  
!     public String staticForwarderName(String filename) {
!         return headerInterfaceName(filename) + "_h";
      }
  
      private void usePackageForFolder(Path folder, String pkg) {
          folder = folder.normalize().toAbsolutePath();
          String existing = pkgMap.putIfAbsent(folder, pkg);
--- 48,69 ----
                  .map(Path::getParent)
                  .forEach(p -> usePackageForFolder(p, ctx.options.targetPackage));
          ctx.options.pkgMappings.forEach(this::usePackageForFolder);
      }
  
!     private static String safeFileName(String filename) {
          int ext = filename.lastIndexOf('.');
          String name = ext != -1 ? filename.substring(0, ext) : filename;
          return Utils.toClassName(name);
      }
  
!     public static String headerInterfaceName(String filename) {
!         return safeFileName(filename) + "_h";
!     }
! 
!     public static String staticForwarderName(String filename) {
!         return safeFileName(filename) + "_lib";
      }
  
      private void usePackageForFolder(Path folder, String pkg) {
          folder = folder.normalize().toAbsolutePath();
          String existing = pkgMap.putIfAbsent(folder, pkg);