diff --git a/tools/configure.py b/tools/configure.py
index aa275e39..989059bf 100644
--- a/tools/configure.py
+++ b/tools/configure.py
@@ -130,7 +130,7 @@ def create_targz(dstfile, filelist):
 def cstring(x):
     return '"' + x + '"'  # good enough for now
 
-# DUK_VERSION is grepped from duk_api_public.h.in: it is needed for the
+# DUK_VERSION is grepped from duktape.h.in: it is needed for the
 # public API and we want to avoid defining it in two places.
 def get_duk_version(apiheader_filename):
     r = re.compile(r'^#define\s+DUK_VERSION\s+(.*?)L?\s*$')
@@ -312,7 +312,7 @@ def main():
             duk_dist_meta = json.loads(f.read())
 
     duk_version, duk_major, duk_minor, duk_patch, duk_version_formatted = \
-        get_duk_version(os.path.join(srcdir, 'duk_api_public.h.in'))
+        get_duk_version(os.path.join(srcdir, 'duktape.h.in'))
 
     git_commit = None
     git_branch = None
@@ -432,6 +432,7 @@ def main():
         'duk_bi_symbol.c',
         'duk_bi_thread.c',
         'duk_bi_thrower.c',
+        'duk_dblunion.h',
         'duk_debug_fixedbuffer.c',
         'duk_debug.h',
         'duk_debug_macros.c',
@@ -611,8 +612,6 @@ def main():
         '@DUK_SINGLE_FILE@': '#define DUK_SINGLE_FILE',
         '@LICENSE_TXT@': read_file(os.path.join(tempdir, 'LICENSE.txt.tmp'), strip_last_nl=True),
         '@AUTHORS_RST@': read_file(os.path.join(tempdir, 'AUTHORS.rst.tmp'), strip_last_nl=True),
-        '@DUK_API_PUBLIC_H@': read_file(os.path.join(srcdir, 'duk_api_public.h.in'), strip_last_nl=True),
-        '@DUK_DBLUNION_H@': read_file(os.path.join(srcdir, 'duk_dblunion.h.in'), strip_last_nl=True),
         '@DUK_VERSION_FORMATTED@': duk_version_formatted,
         '@GIT_COMMIT@': git_commit,
         '@GIT_COMMIT_CSTRING@': git_commit_cstring,
diff --git a/util/dist.py b/util/dist.py
index cf6d3b52..d7ad34d4 100644
--- a/util/dist.py
+++ b/util/dist.py
@@ -104,11 +104,11 @@ def cstring(x):
     return '"' + x + '"'  # good enough for now
 
 # Get Duktape version number as an integer.  DUK_VERSION is grepped from
-# duk_api_public.h.in: it is needed for the public API and we want to avoid
+# duktape.h.in: it is needed for the public API and we want to avoid
 # defining it in multiple places.
 def get_duk_version():
     r = re.compile(r'^#define\s+DUK_VERSION\s+(.*?)L?\s*$')
-    with open(os.path.join('src-input', 'duk_api_public.h.in'), 'rb') as f:
+    with open(os.path.join('src-input', 'duktape.h.in'), 'rb') as f:
         for line in f:
             m = r.match(line)
             if m is not None:
@@ -164,7 +164,7 @@ def create_dist_directories(dist):
 # works from there.
 
 def check_cwd_duktape_repo_root():
-    if not (os.path.isfile(os.path.join('src-input', 'duk_api_public.h.in')) and \
+    if not (os.path.isfile(os.path.join('src-input', 'duktape.h.in')) and \
             os.path.isfile(os.path.join('config', 'platforms.yaml'))):
         sys.stderr.write('\n')
         sys.stderr.write('*** Working directory must be Duktape repo checkout root!\n')
@@ -312,7 +312,6 @@ def main():
         'duk_api_inspect.c',
         'duk_api_memory.c',
         'duk_api_object.c',
-        'duk_api_public.h.in',
         'duk_api_stack.c',
         'duk_api_string.c',
         'duk_api_time.c',
@@ -340,7 +339,7 @@ def main():
         'duk_bi_symbol.c',
         'duk_bi_thread.c',
         'duk_bi_thrower.c',
-        'duk_dblunion.h.in',
+        'duk_dblunion.h',
         'duk_debug_fixedbuffer.c',
         'duk_debugger.c',
         'duk_debugger.h',