Revert "Unexpose config headers (low hanging fruit only) (backport #12773)"

src/libutil-c/meson.build

@@ -23,6 +23,7 @@ deps_public_maybe_subproject = [
 ]
 subdir('nix-meson-build-support/subprojects')
 
+# TODO rename, because it will conflict with downstream projects
 configdata.set_quoted('PACKAGE_VERSION', meson.project_version())
 
 config_h = configure_file(
@@ -37,6 +38,8 @@ add_project_arguments(
   # From C++ libraries, only for internals
   '-include', 'config-util.hh',
 
+  # From C libraries, for our public, installed headers too
+  '-include', 'config-util.h',
   language : 'cpp',
 )
 
@@ -48,7 +51,7 @@ sources = files(
 
 include_dirs = [include_directories('.')]
 
-headers = files(
+headers = [config_h] + files(
   'nix_api_util.h',
 )
 
@@ -61,7 +64,6 @@ subdir('nix-meson-build-support/windows-version')
 this_library = library(
   'nixutilc',
   sources,
-  config_h,
   dependencies : deps_public + deps_private + deps_other,
   include_directories : include_dirs,
   link_args: linker_export_flags,

src/libutil-c/nix_api_util.cc

@@ -7,8 +7,6 @@
 #include <cxxabi.h>
 #include <typeinfo>
 
-#include "config-util.h"
-
 nix_c_context * nix_c_context_create()
 {
     return new nix_c_context();