diff --git a/src/srun/allocate.c b/src/srun/allocate.c
index b63c66245902ab4377119521410af80a1bc38816..7b27730f4820f875d3c0ce67d2429618b6c6eda1 100644
--- a/src/srun/allocate.c
+++ b/src/srun/allocate.c
@@ -40,6 +40,7 @@
 #include "src/srun/allocate.h"
 #include "src/srun/msg.h"
 #include "src/srun/opt.h"
+#include "src/srun/env.h"
 #include "src/srun/attach.h"
 
 #define MAX_ALLOC_WAIT 60	/* seconds */
@@ -214,7 +215,7 @@ _intr_handler(int signo)
  * (see opt.h)
  */
 job_desc_msg_t *
-job_desc_msg_create_from_opts (const char *script)
+job_desc_msg_create_from_opts (char *script)
 {
 	extern char **environ;
 	job_desc_msg_t *j = xmalloc(sizeof(*j));
diff --git a/src/srun/allocate.h b/src/srun/allocate.h
index 4b8da6d0fc44c7f2f422e2158b086b2c7b504340..2eef790161ab2adc32c41ffb019d49df30e73986 100644
--- a/src/srun/allocate.h
+++ b/src/srun/allocate.h
@@ -47,7 +47,7 @@ resource_allocation_response_msg_t * allocate_nodes(void);
  * (see opt.h), if script != NULL then this is a batch job.
  * The resulting memory must be freed with  job_desc_msg_destroy()
  */
-job_desc_msg_t * job_desc_msg_create_from_opts (const char *script);
+job_desc_msg_t * job_desc_msg_create_from_opts (char *script);
 
 /* 
  * Destroy (free memory from) a job_desc_msg_t object allocated with
diff --git a/src/srun/env.c b/src/srun/env.c
index 96305a117c0f0db13ee71b2ac8acec87485f2750..38ab8bd40684e62e19e7a1763859a572485063ad 100644
--- a/src/srun/env.c
+++ b/src/srun/env.c
@@ -37,7 +37,7 @@ setenvf(const char *fmt, ...)
  * Return the number of elements in the environment `env'
  */
 int 
-envcount (const char **env)
+envcount (char **env)
 {
 	int envc = 0;
 	while (env[envc] != NULL)
diff --git a/src/srun/launch.c b/src/srun/launch.c
index 1f1600c7ace67b673ac73aa6ed876d187b48f646..43c60e89913586020d913561ac8ce693500ace96 100644
--- a/src/srun/launch.c
+++ b/src/srun/launch.c
@@ -254,11 +254,6 @@ static int _wait_on_active(thd_t *thd, job_t *job)
 	return rc;
 }
 
-static void _alrm_handler(int signo) 
-{
-	return;
-}
-
 /* _p_launch - parallel (multi-threaded) task launcher */
 static void _p_launch(slurm_msg_t *req, job_t *job)
 {