diff --git a/src/common/slurm_xlator.h b/src/common/slurm_xlator.h
index c65324f286c00db4f183fcfc8002eafec54fe219..4ec680ecd03acd75df8027794e9fef446bae67f6 100644
--- a/src/common/slurm_xlator.h
+++ b/src/common/slurm_xlator.h
@@ -91,7 +91,6 @@
 #define	bit_set_count_range	slurm_bit_set_count_range
 #define	bit_clear_count		slurm_bit_clear_count
 #define	bit_nset_max_count	slurm_bit_nset_max_count
-#define	bit_and_set_count	slurm_bit_and_set_count
 #define	bit_rotate_copy		slurm_bit_rotate_copy
 #define	bit_rotate		slurm_bit_rotate
 #define	bit_fmt			slurm_bit_fmt
diff --git a/src/plugins/acct_gather_profile/none/acct_gather_profile_none.c b/src/plugins/acct_gather_profile/none/acct_gather_profile_none.c
index 066c36f3529faee109eb9f182b4b21ee5772fa1a..954eefd914c763f4f4387dfaa6ca777a2b580cd0 100644
--- a/src/plugins/acct_gather_profile/none/acct_gather_profile_none.c
+++ b/src/plugins/acct_gather_profile/none/acct_gather_profile_none.c
@@ -53,7 +53,6 @@
 #include <signal.h>
 
 #define _DEBUG 1
-#define _DEBUG_STATS 1
 
 /*
  * These variables are required by the generic plugin interface.  If they
diff --git a/src/plugins/slurmctld/nonstop/msg.c b/src/plugins/slurmctld/nonstop/msg.c
index 12e8d1ef05e2ba3d8bafa8cf2b431140aea381e0..f63f9b2422ca010d3214551dc7d1c833842f5bc1 100644
--- a/src/plugins/slurmctld/nonstop/msg.c
+++ b/src/plugins/slurmctld/nonstop/msg.c
@@ -65,9 +65,6 @@ char *version_string = "VERSION:17.02";
  * socket, abort after _MAX_RETRIES poll() failures. */
 #define _MAX_RETRIES	10
 
-/* Maximum size of any single field returned (e.g. node list, job name). */
-#define _MAX_NAME_SIZE	256
-
 static bool thread_running = false;
 static bool thread_shutdown = false;
 static pthread_mutex_t thread_flag_mutex = PTHREAD_MUTEX_INITIALIZER;
diff --git a/src/slurmctld/slurmctld.h b/src/slurmctld/slurmctld.h
index b1f88f2d4b9379ea85052a7d5c82edb12df361e5..a09d57b35bf4725ad69e99a19d8a45f48fdadcda 100644
--- a/src/slurmctld/slurmctld.h
+++ b/src/slurmctld/slurmctld.h
@@ -434,7 +434,6 @@ extern time_t last_job_update;	/* time of last update to job records */
 
 #define DETAILS_MAGIC	0xdea84e7
 #define JOB_MAGIC	0xf0b7392c
-#define STEP_MAGIC	0xce593bc1
 
 #define FEATURE_OP_OR   0
 #define FEATURE_OP_AND  1
diff --git a/src/slurmctld/srun_comm.c b/src/slurmctld/srun_comm.c
index 0215acec15807f41d3c9a7aa1c6339fd1c683667..75fc7ba393c0506cdea08eb9f1207840dbc4f0f0 100644
--- a/src/slurmctld/srun_comm.c
+++ b/src/slurmctld/srun_comm.c
@@ -49,8 +49,6 @@
 #include "src/slurmctld/slurmctld.h"
 #include "src/slurmctld/srun_comm.h"
 
-#define SRUN_LAUNCH_MSG 0
-
 /* Launch the srun request. Note that retry is always zero since
  * we don't want to clog the system up with messages destined for
  * defunct srun processes
diff --git a/src/slurmd/slurmd/req.c b/src/slurmd/slurmd/req.c
index 91a2c42e6fc4e694d23f980f7f6c474e09491a57..47c83705b77c4246eeecd1ee3e56999bdcf33741 100644
--- a/src/slurmd/slurmd/req.c
+++ b/src/slurmd/slurmd/req.c
@@ -108,8 +108,6 @@
 #define RETRY_DELAY 15		/* retry every 15 seconds */
 #define MAX_RETRY   240		/* retry 240 times (one hour max) */
 
-#define EPIL_RETRY_MAX 2	/* max retries of epilog complete message */
-
 #ifndef MAXHOSTNAMELEN
 #define MAXHOSTNAMELEN	64
 #endif
diff --git a/src/srun/libsrun/opt.h b/src/srun/libsrun/opt.h
index 6c8acec6a6cbbdf55ab0f9af212a99fab7bc1637..f7c339333687640374eda925220dd0fc83c8ee51 100644
--- a/src/srun/libsrun/opt.h
+++ b/src/srun/libsrun/opt.h
@@ -58,8 +58,6 @@
 #define DEFAULT_IMMEDIATE	1
 #define MAX_THREADS		60
 
-#define INT_UNASSIGNED ((int)-1)
-
 /* global variables relating to user options */
 extern int _verbose;
 
diff --git a/src/srun/srun.c b/src/srun/srun.c
index 359847138e1d042024d30fa27811f9de2c560452..b4a799d64b9848610f1ee132409c2abe0b62fb4e 100644
--- a/src/srun/srun.c
+++ b/src/srun/srun.c
@@ -95,8 +95,6 @@
 #define OPEN_MPI_PORT_ERROR 108
 #endif
 
-#define MAX_ENTRIES 50
-
 static struct termios termdefaults;
 static uint32_t global_rc = 0;
 static srun_job_t *job = NULL;
diff --git a/src/sstat/sstat.h b/src/sstat/sstat.h
index 8f938fe3b2ce7a99c33089f665001430c225b6b6..d26981960b5477abd4f97f8f49749ef2ac78370b 100644
--- a/src/sstat/sstat.h
+++ b/src/sstat/sstat.h
@@ -68,8 +68,6 @@
 
 #define STAT_FIELDS_PID "jobid,nodelist,pids"
 
-#define STATE_COUNT 10
-
 #define MAX_PRINTFIELDS 100
 
 #define SECONDS_IN_MINUTE 60