diff --git a/browser/MDB_FLAGS.in b/browser/MDB_FLAGS.in
index 005a9a000..ec460906b 100644
--- a/browser/MDB_FLAGS.in
+++ b/browser/MDB_FLAGS.in
@@ -11,6 +11,8 @@
 --warn-implicit-stream-calls
 --warn-potentially-ambiguous-pragma
 --halt-at-warn
+--no-halt-at-warn-make-int
+--no-halt-at-warn-make-opt
 --no-warn-inferred-erroneous
 --no-mercury-stdlib-dir
 --no-detect-libgrades
diff --git a/compiler/COMP_FLAGS.in b/compiler/COMP_FLAGS.in
index 9310b6c42..55d783346 100644
--- a/compiler/COMP_FLAGS.in
+++ b/compiler/COMP_FLAGS.in
@@ -12,6 +12,8 @@
 --warn-implicit-stream-calls
 --warn-potentially-ambiguous-pragma
 --halt-at-warn
+--no-halt-at-warn-make-int
+--no-halt-at-warn-make-opt
 --no-mercury-stdlib-dir
 --no-detect-libgrades
 -I../library
diff --git a/deep_profiler/DEEP_FLAGS.in b/deep_profiler/DEEP_FLAGS.in
index d8c0153b4..ff5a707de 100644
--- a/deep_profiler/DEEP_FLAGS.in
+++ b/deep_profiler/DEEP_FLAGS.in
@@ -11,6 +11,8 @@
 --warn-implicit-stream-calls
 --warn-potentially-ambiguous-pragma
 --halt-at-warn
+--no-halt-at-warn-make-int
+--no-halt-at-warn-make-opt
 --no-warn-inferred-erroneous
 --no-mercury-stdlib-dir
 --no-detect-libgrades
diff --git a/grade_lib/GRADE_LIB_FLAGS.in b/grade_lib/GRADE_LIB_FLAGS.in
index 7ad26ca5f..369c1c4c4 100644
--- a/grade_lib/GRADE_LIB_FLAGS.in
+++ b/grade_lib/GRADE_LIB_FLAGS.in
@@ -10,6 +10,8 @@
 --warn-suspicious-foreign-code
 --warn-potentially-ambiguous-pragma
 --halt-at-warn
+--no-halt-at-warn-make-int
+--no-halt-at-warn-make-opt
 --no-warn-inferred-erroneous
 --no-mercury-stdlib-dir
 --no-detect-libgrades
diff --git a/library/LIB_FLAGS.in b/library/LIB_FLAGS.in
index 76c143e3b..30e1655cb 100644
--- a/library/LIB_FLAGS.in
+++ b/library/LIB_FLAGS.in
@@ -12,6 +12,8 @@
 --warn-suspicious-foreign-code
 --warn-potentially-ambiguous-pragma
 --halt-at-warn
+--no-halt-at-warn-make-int
+--no-halt-at-warn-make-opt
 --warn-dead-predicates
 --no-warn-inferred-erroneous
 --no-mercury-stdlib-dir
diff --git a/mdbcomp/MDBCOMP_FLAGS.in b/mdbcomp/MDBCOMP_FLAGS.in
index 3e00e89fe..bce2ae17b 100644
--- a/mdbcomp/MDBCOMP_FLAGS.in
+++ b/mdbcomp/MDBCOMP_FLAGS.in
@@ -11,6 +11,8 @@
 --warn-implicit-stream-calls
 --warn-potentially-ambiguous-pragma
 --halt-at-warn
+--no-halt-at-warn-make-int
+--no-halt-at-warn-make-opt
 --no-warn-inferred-erroneous
 --no-mercury-stdlib-dir
 --no-detect-libgrades
diff --git a/mfilterjavac/MFILTERJAVAC_FLAGS.in b/mfilterjavac/MFILTERJAVAC_FLAGS.in
index bd0db1b94..822af4913 100644
--- a/mfilterjavac/MFILTERJAVAC_FLAGS.in
+++ b/mfilterjavac/MFILTERJAVAC_FLAGS.in
@@ -9,6 +9,8 @@
 --warn-insts-with-functors-without-type
 --warn-potentially-ambiguous-pragma
 --halt-at-warn
+--no-halt-at-warn-make-int
+--no-halt-at-warn-make-opt
 --no-warn-inferred-erroneous
 --no-mercury-stdlib-dir
 --no-detect-libgrades
diff --git a/profiler/PROF_FLAGS.in b/profiler/PROF_FLAGS.in
index 801167da5..36d32b426 100644
--- a/profiler/PROF_FLAGS.in
+++ b/profiler/PROF_FLAGS.in
@@ -11,6 +11,8 @@
 --warn-implicit-stream-calls
 --warn-potentially-ambiguous-pragma
 --halt-at-warn
+--no-halt-at-warn-make-int
+--no-halt-at-warn-make-opt
 --no-warn-inferred-erroneous
 --no-mercury-stdlib-dir
 --no-detect-libgrades
diff --git a/slice/SLICE_FLAGS.in b/slice/SLICE_FLAGS.in
index 8c4b2b4be..f5ccf6de3 100644
--- a/slice/SLICE_FLAGS.in
+++ b/slice/SLICE_FLAGS.in
@@ -10,6 +10,8 @@
 --warn-suspicious-foreign-code
 --warn-potentially-ambiguous-pragma
 --halt-at-warn
+--no-halt-at-warn-make-int
+--no-halt-at-warn-make-opt
 --no-warn-inferred-erroneous
 --no-mercury-stdlib-dir
 --no-detect-libgrades
diff --git a/ssdb/SSDB_FLAGS.in b/ssdb/SSDB_FLAGS.in
index c329b46e7..b51fd325e 100644
--- a/ssdb/SSDB_FLAGS.in
+++ b/ssdb/SSDB_FLAGS.in
@@ -10,6 +10,8 @@
 --warn-suspicious-foreign-code
 --warn-potentially-ambiguous-pragma
 --halt-at-warn
+--no-halt-at-warn-make-int
+--no-halt-at-warn-make-opt
 --no-warn-inferred-erroneous
 --no-mercury-stdlib-dir
 --no-detect-libgrades