diff --git a/src/slurmctld/job_mgr.c b/src/slurmctld/job_mgr.c
index 977b4f500747fd52acb7c74d9a5e4b7052e2aca7..ba3b6a3a56a0cd4e2bbb248aad8e03853c50acba 100644
--- a/src/slurmctld/job_mgr.c
+++ b/src/slurmctld/job_mgr.c
@@ -66,7 +66,7 @@ slurm_ssl_key_ctx_t sign_ctx ;
 #define MAX_STR_PACK 128
 #define SLURM_CREATE_JOB_FLAG_NO_ALLOCATE_0 0
 #define STEP_FLAG 0xbbbb
-#define TOP_PRIORITY 100000;
+#define TOP_PRIORITY 0xffff0000 /* large, but leave headroom for higher */
 
 #define job_hash_inx(job_id)	(job_id % MAX_JOB_COUNT)
 #define yes_or_no(in_string) \
diff --git a/src/slurmctld/step_mgr.c b/src/slurmctld/step_mgr.c
index ecba1fbd8fa1381df5b9257879709d319df8dee8..cc213a15918afd5bf1d3a5daa58899958ed91aba 100644
--- a/src/slurmctld/step_mgr.c
+++ b/src/slurmctld/step_mgr.c
@@ -36,8 +36,11 @@
 #include <stdlib.h>
 #include <string.h>
 
+#ifdef HAVE_LIBELAN3
+#  include <src/common/qsw.h>
+#endif
+
 #include <src/common/bitstring.h>
-#include <src/common/qsw.h>
 #include <src/common/slurm_errno.h>
 #include <src/slurmctld/locks.h>
 #include <src/slurmctld/slurmctld.h>