diff --git a/include/minizinc/htmlprinter.hh b/include/minizinc/htmlprinter.hh
index c92b0e63a..05d3980b4 100644
--- a/include/minizinc/htmlprinter.hh
+++ b/include/minizinc/htmlprinter.hh
@@ -15,6 +15,8 @@
 #include <utility>
 #include <vector>
 
+#include <minizinc/flatten_internal.hh>
+
 namespace MiniZinc {
 
 class Model;
diff --git a/include/minizinc/statistics.hh b/include/minizinc/statistics.hh
index f10e638f3..c5475715b 100644
--- a/include/minizinc/statistics.hh
+++ b/include/minizinc/statistics.hh
@@ -12,6 +12,10 @@
 #pragma once
 
 #include <iterator>
+#include <ios>
+
+#include <minizinc/ast.hh>
+#include <minizinc/prettyprinter.hh>
 
 namespace MiniZinc {
 
diff --git a/lib/parser.yxx b/lib/parser.yxx
index ffee0a8ba..ffe55b43a 100644
--- a/lib/parser.yxx
+++ b/lib/parser.yxx
@@ -9,6 +9,10 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
+%code requires {
+#include <minizinc/ast.hh>
+}
+
 %define api.pure
 
 %parse-param {void *parm}
@@ -32,6 +36,8 @@ namespace MiniZinc{ class ParserLocation; }
 #define YYMAXDEPTH 10000
 #define YYINITDEPTH 10000
 
+#include <vector>
+
 #include <minizinc/parser.hh>
 #include <minizinc/file_utils.hh>