diff --git a/compiler/check_import_accessibility.m b/compiler/check_import_accessibility.m index e1db2a5af..3418cb6d3 100644 --- a/compiler/check_import_accessibility.m +++ b/compiler/check_import_accessibility.m @@ -38,8 +38,6 @@ :- module parse_tree.check_import_accessibility. :- interface. -:- import_module mdbcomp. -:- import_module mdbcomp.sym_name. :- import_module parse_tree.error_spec. :- import_module parse_tree.prog_item. @@ -78,6 +76,8 @@ :- import_module libs. :- import_module libs.globals. +:- import_module mdbcomp. +:- import_module mdbcomp.sym_name. :- import_module parse_tree.item_util. :- import_module parse_tree.prog_data. :- import_module parse_tree.prog_data_foreign. diff --git a/compiler/hlds_proc_util.m b/compiler/hlds_proc_util.m index 94dfddbbb..ee90051ab 100644 --- a/compiler/hlds_proc_util.m +++ b/compiler/hlds_proc_util.m @@ -26,7 +26,6 @@ :- import_module parse_tree.var_table. :- import_module list. -:- import_module map. %---------------------------------------------------------------------------% % @@ -139,6 +138,7 @@ :- import_module assoc_list. :- import_module int. +:- import_module map. :- import_module maybe. :- import_module pair. :- import_module require. diff --git a/compiler/prog_type.m b/compiler/prog_type.m index 04501b8e6..976964dd5 100644 --- a/compiler/prog_type.m +++ b/compiler/prog_type.m @@ -27,7 +27,6 @@ :- import_module bool. :- import_module list. :- import_module map. -:- import_module term. %---------------------------------------------------------------------------% @@ -220,6 +219,7 @@ :- import_module int. :- import_module require. :- import_module string. +:- import_module term. %---------------------------------------------------------------------------% diff --git a/compiler/prog_type_scan.m b/compiler/prog_type_scan.m index 74faa0056..9c88d48c0 100644 --- a/compiler/prog_type_scan.m +++ b/compiler/prog_type_scan.m @@ -20,7 +20,6 @@ :- import_module list. :- import_module set. -:- import_module term. %---------------------------------------------------------------------------% @@ -68,6 +67,8 @@ :- implementation. +:- import_module term. + %---------------------------------------------------------------------------% set_of_type_vars_in_type(Type, SetOfTVars) :- diff --git a/compiler/prog_type_test.m b/compiler/prog_type_test.m index ec0142999..39dc53e4a 100644 --- a/compiler/prog_type_test.m +++ b/compiler/prog_type_test.m @@ -21,7 +21,6 @@ :- import_module parse_tree.prog_data. :- import_module list. -:- import_module term. %---------------------------------------------------------------------------% % @@ -138,6 +137,7 @@ :- import_module parse_tree.prog_type_scan. :- import_module require. +:- import_module term. %---------------------------------------------------------------------------% diff --git a/compiler/prog_type_unify.m b/compiler/prog_type_unify.m index 02d65ad25..6ee13fe7c 100644 --- a/compiler/prog_type_unify.m +++ b/compiler/prog_type_unify.m @@ -18,8 +18,6 @@ :- import_module parse_tree.prog_data. :- import_module list. -:- import_module map. -:- import_module term. %---------------------------------------------------------------------------% % @@ -108,7 +106,9 @@ :- import_module parse_tree.prog_type_scan. :- import_module parse_tree.prog_type_subst. +:- import_module map. :- import_module require. +:- import_module term. %---------------------------------------------------------------------------%