diff --git a/src/solvers/lowering/byte_operators.cpp b/src/solvers/lowering/byte_operators.cpp
index cb714ca3551..6d9a747a82b 100644
--- a/src/solvers/lowering/byte_operators.cpp
+++ b/src/solvers/lowering/byte_operators.cpp
@@ -6,10 +6,6 @@ Author: Daniel Kroening, kroening@kroening.com
 
 \*******************************************************************/
 
-#include "expr_lowering.h"
-
-#include <algorithm>
-
 #include <util/arith_tools.h>
 #include <util/bitvector_expr.h>
 #include <util/byte_operators.h>
@@ -17,10 +13,15 @@ Author: Daniel Kroening, kroening@kroening.com
 #include <util/endianness_map.h>
 #include <util/expr_util.h>
 #include <util/namespace.h>
+#include <util/narrow.h>
 #include <util/pointer_offset_size.h>
 #include <util/simplify_expr.h>
 #include <util/string_constant.h>
 
+#include "expr_lowering.h"
+
+#include <algorithm>
+
 static exprt bv_to_expr(
   const exprt &bitvector_expr,
   const typet &target_type,
diff --git a/src/solvers/prop/bdd_expr.cpp b/src/solvers/prop/bdd_expr.cpp
index 2929db8ee6f..3c4242a5077 100644
--- a/src/solvers/prop/bdd_expr.cpp
+++ b/src/solvers/prop/bdd_expr.cpp
@@ -13,6 +13,7 @@ Author: Michael Tautschnig, michael.tautschnig@qmul.ac.uk
 
 #include <util/expr_util.h>
 #include <util/invariant.h>
+#include <util/narrow.h>
 #include <util/std_expr.h>
 
 bddt bdd_exprt::from_expr_rec(const exprt &expr)