From 5d82d6e7336d595ab2a3354547641eadc158c6e7 Mon Sep 17 00:00:00 2001
From: Yorick van Pelt <yorick@yorickvanpelt.nl>
Date: Fri, 11 Aug 2023 11:49:10 +0200
Subject: [PATCH] nix_api: fix missing includes in headers

Forward declaration doesn't work here, since we define classes that
contain the objects
---
 src/libexpr/c/nix_api_expr_internal.h | 7 ++-----
 src/libutil/c/nix_api_util_internal.h | 7 +++----
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/src/libexpr/c/nix_api_expr_internal.h b/src/libexpr/c/nix_api_expr_internal.h
index 3ee3b18af..bae50cf59 100644
--- a/src/libexpr/c/nix_api_expr_internal.h
+++ b/src/libexpr/c/nix_api_expr_internal.h
@@ -1,11 +1,8 @@
 #ifndef NIX_API_EXPR_INTERNAL_H
 #define NIX_API_EXPR_INTERNAL_H
 
-// forward declaration
-namespace nix {
-class EvalState;
-class BindingsBuilder;
-}; // namespace nix
+#include "eval.hh"
+#include "attr-set.hh"
 
 struct State {
   nix::EvalState state;
diff --git a/src/libutil/c/nix_api_util_internal.h b/src/libutil/c/nix_api_util_internal.h
index 9ece28588..013d3bbbb 100644
--- a/src/libutil/c/nix_api_util_internal.h
+++ b/src/libutil/c/nix_api_util_internal.h
@@ -2,11 +2,10 @@
 #define NIX_API_UTIL_INTERNAL_H
 
 #include <string>
+#include <optional>
 
-// forward declaration
-namespace nix {
-class Error;
-};
+#include "error.hh"
+#include "nix_api_util.h"
 
 struct nix_c_context {
   nix_err last_err_code = NIX_OK;