diff --git a/policy/kernel/file_low_api.cas b/policy/kernel/file_low_api.cas
index 1c626a0..b442ffa 100644
--- a/policy/kernel/file_low_api.cas
+++ b/policy/kernel/file_low_api.cas
@@ -12,11 +12,7 @@ let files_loose_execmod = false;
 // General object class sets
 //
 
-// All directory and file classes
-let dir_file_class_set = [ dir file_class_set ];
-
-// All non-directory file classes.
-let file_class_set = [ devfile_class_set notdevfile_class_set ];
+let devfile_class_set = [ blk_file chr_file ];
 
 // Non-device file classes.
 let notdevfile_class_set = [ fifo_file file lnk_file sock_file ];
@@ -24,6 +20,12 @@ let notdevfile_class_set = [ fifo_file file lnk_file sock_file ];
 // Non-device file classes.
 let dir_notdevfile_class_set = [ dir notdevfile_class_set ];
 
+// All non-directory file classes.
+let file_class_set = [ devfile_class_set notdevfile_class_set ];
+
+// All directory and file classes
+let dir_file_class_set = [ dir file_class_set ];
+
 //
 // Low-level regular file API
 //
diff --git a/policy/system/selinuxutil.cas b/policy/system/selinuxutil.cas
index 0fa854c..fb2d364 100644
--- a/policy/system/selinuxutil.cas
+++ b/policy/system/selinuxutil.cas
@@ -509,6 +509,14 @@ module selinuxutil_base {
     resource selinux_policy_t;
 }
 
+module semanage {
+    domain semanage_t;
+}
+
+module setfiles {
+    domain setfiles_t;
+}
+
 module selinuxutil {
     module checkpolicy;
     module selinuxutil_base;
@@ -519,11 +527,3 @@ module selinuxutil {
     module semanage;
     module setfiles;
 }
-
-module semanage {
-    domain semanage;
-}
-
-module setfiles {
-    domain setfiles_t;
-}