diff --git a/config.h.in b/config.h.in
index 652fafe7e47072adc9b97c6406e497124e5ce1e8..cdc61ec7321556984930e8d29d191aa172bd461d 100644
--- a/config.h.in
+++ b/config.h.in
@@ -645,9 +645,6 @@
 /* Define the project's version. */
 #undef VERSION
 
-/* Define if you have pthreads. */
-#undef WITH_PTHREADS
-
 /* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
    significant byte first (like Motorola and SPARC, unlike Intel). */
 #if defined AC_APPLE_UNIVERSAL_BUILD
diff --git a/configure b/configure
index 2092ba2b306f143bcfce35cb292fb7df5bce2d01..b30ba7492668406715deef593726a89e1b0a2d2e 100755
--- a/configure
+++ b/configure
@@ -20865,10 +20865,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
-# Always define WITH_PTHREADS if we make it this far
-
-$as_echo "#define WITH_PTHREADS 1" >>confdefs.h
-
 LDFLAGS="$LDFLAGS "
 CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
 LIBS="$PTHREAD_LIBS $LIBS"
diff --git a/configure.ac b/configure.ac
index 1f2f901b7afb67e8b1bee27c5a162888ad8e4514..03e4e72ac4a69b28483044c25f14744157cb0989 100644
--- a/configure.ac
+++ b/configure.ac
@@ -221,8 +221,6 @@ AM_CONDITIONAL(HAVE_UNSETENV, test "x$have_unsetenv" = "xyes")
 
 ACX_PTHREAD([], AC_MSG_ERROR([Error: Cannot figure out how to use pthreads!]))
 
-# Always define WITH_PTHREADS if we make it this far
-AC_DEFINE(WITH_PTHREADS,1,[Define if you have pthreads.])
 LDFLAGS="$LDFLAGS "
 CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
 LIBS="$PTHREAD_LIBS $LIBS"
diff --git a/src/plugins/job_submit/lua/job_submit_lua.c b/src/plugins/job_submit/lua/job_submit_lua.c
index e81876d8d091aa34f73cd0eb7ea202e54483ab6e..c1892fa4a3187ef095b28fb9c3dd7fde3e8d5c22 100644
--- a/src/plugins/job_submit/lua/job_submit_lua.c
+++ b/src/plugins/job_submit/lua/job_submit_lua.c
@@ -109,9 +109,7 @@ time_t last_lua_resv_update = (time_t) 0;
  *  Mutex for protecting multi-threaded access to this plugin.
  *   (Only 1 thread at a time should be in here)
  */
-#ifdef WITH_PTHREADS
 static pthread_mutex_t lua_lock = PTHREAD_MUTEX_INITIALIZER;
-#endif
 
 /* These are defined here so when we link with something other than
  * the slurmctld we will have these symbols defined.  They will get
diff --git a/src/plugins/mpi/mpichgm/mpichgm.c b/src/plugins/mpi/mpichgm/mpichgm.c
index 62186d144979eb69acffd2a56d674d030114067a..e71de4e2b2efd6dd5c318adc7b789e0521c84a4e 100644
--- a/src/plugins/mpi/mpichgm/mpichgm.c
+++ b/src/plugins/mpi/mpichgm/mpichgm.c
@@ -40,16 +40,13 @@
 #  include "config.h"
 #endif
 
-#ifdef WITH_PTHREADS
-#  include <pthread.h>
-#endif
-
+#include <netinet/in.h>
+#include <pthread.h>
 #include <signal.h>
 #include <stdlib.h>
+#include <string.h>
 #include <sys/types.h>
 #include <sys/socket.h>
-#include <netinet/in.h>
-#include <string.h>
 
 #include "src/common/slurm_xlator.h"
 #include "src/common/net.h"
diff --git a/src/plugins/mpi/mpichmx/mpichmx.c b/src/plugins/mpi/mpichmx/mpichmx.c
index 18a0f394c5e88500ccd154c1100fd47d266f1db0..b1f5836bb9c1b05953f4573a7341efd91fe9c4b1 100644
--- a/src/plugins/mpi/mpichmx/mpichmx.c
+++ b/src/plugins/mpi/mpichmx/mpichmx.c
@@ -40,16 +40,13 @@
 #  include "config.h"
 #endif
 
-#ifdef WITH_PTHREADS
-#  include <pthread.h>
-#endif
-
+#include <netinet/in.h>
+#include <pthread.h>
 #include <signal.h>
 #include <stdlib.h>
+#include <string.h>
 #include <sys/types.h>
 #include <sys/socket.h>
-#include <netinet/in.h>
-#include <string.h>
 
 #include "src/common/slurm_xlator.h"
 #include "src/common/net.h"
diff --git a/src/plugins/mpi/mvapich/mvapich.c b/src/plugins/mpi/mvapich/mvapich.c
index e41522d5df3c0fbf557e2cc8b805f13d3b5aeed7..40847d6474e82cd69f0d2ace55874319e60bdb7d 100644
--- a/src/plugins/mpi/mvapich/mvapich.c
+++ b/src/plugins/mpi/mvapich/mvapich.c
@@ -40,24 +40,18 @@
 #  include "config.h"
 #endif
 
-#ifdef WITH_PTHREADS
-#  include <pthread.h>
-#endif
-
-#include <stdlib.h>
+#include <arpa/inet.h>
+#include <errno.h>
+#include <netinet/in.h>
+#include <munge.h>	/* include munge and syslog to log auth failures */
+#include <poll.h>
+#include <pthread.h>
 #include <signal.h>
+#include <stdlib.h>
+#include <string.h>
 #include <sys/types.h>
 #include <sys/socket.h>
-#include <netinet/in.h>
-#include <string.h>
-#include <poll.h>
 #include <sys/time.h>
-
-#include <arpa/inet.h>
-#include <errno.h>
-
-/* include munge and syslog to log authentication faiulres */
-#include <munge.h>
 #include <syslog.h>
 
 #include "src/common/slurm_xlator.h"
diff --git a/src/plugins/proctrack/lua/proctrack_lua.c b/src/plugins/proctrack/lua/proctrack_lua.c
index 8712ddf4e72251375ca0c81763c04de8db495daf..b12fff37f5bab74da97132ef8596cd3df10f5965 100644
--- a/src/plugins/proctrack/lua/proctrack_lua.c
+++ b/src/plugins/proctrack/lua/proctrack_lua.c
@@ -71,9 +71,7 @@ static lua_State *L = NULL;
  *  Mutex for protecting multi-threaded access to this plugin.
  *   (Only 1 thread at a time should be in here)
  */
-#ifdef WITH_PTHREADS
 static pthread_mutex_t lua_lock = PTHREAD_MUTEX_INITIALIZER;
-#endif
 
 /*
  *  Lua interface to SLURM log facility:
diff --git a/src/plugins/select/alps/basil_interface.h b/src/plugins/select/alps/basil_interface.h
index e00e53cd669c35c0ace29ae2ea0a6a0839d11491..b5f95016bed374540cf08d58656e7e21909f48b5 100644
--- a/src/plugins/select/alps/basil_interface.h
+++ b/src/plugins/select/alps/basil_interface.h
@@ -11,9 +11,7 @@
 # include "config.h"
 #endif	/* HAVE_CONFIG_H */
 
-#ifdef WITH_PTHREADS
-#  include <pthread.h>
-#endif				/* WITH_PTHREADS */
+#include <pthread.h>
 
 #include "slurm/slurm.h"
 #include "slurm/slurm_errno.h"
diff --git a/src/plugins/select/bluegene/bridge_linker.h b/src/plugins/select/bluegene/bridge_linker.h
index c37cc6776bc9b3ae95a79c5f79ed90203a8d8216..f6987d4ab0a23093e83da627e0b0c43083c77e6f 100644
--- a/src/plugins/select/bluegene/bridge_linker.h
+++ b/src/plugins/select/bluegene/bridge_linker.h
@@ -51,10 +51,7 @@
 #endif
 
 #include <dlfcn.h>
-
-#ifdef WITH_PTHREADS
-#  include <pthread.h>
-#endif				/* WITH_PTHREADS */
+#include <pthread.h>
 
 #include "src/common/node_select.h"
 #include "src/common/read_config.h"
diff --git a/src/slurmctld/backup.c b/src/slurmctld/backup.c
index df69d3a588e579d266da2b3474a1e16d1f4ed319..1afa3a099c25c91510d5b11022fc9392dbc6407f 100644
--- a/src/slurmctld/backup.c
+++ b/src/slurmctld/backup.c
@@ -41,11 +41,8 @@
 #  include "config.h"
 #endif
 
-#ifdef WITH_PTHREADS
-#  include <pthread.h>
-#endif				/* WITH_PTHREADS */
-
 #include <errno.h>
+#include <pthread.h>
 #include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/src/slurmctld/controller.c b/src/slurmctld/controller.c
index 619d94a0f5b82133da78b75e6517762bf0e08762..2ccb45054b211c877addf1198e2aa61649cdb567 100644
--- a/src/slurmctld/controller.c
+++ b/src/slurmctld/controller.c
@@ -42,16 +42,13 @@
 #  include "config.h"
 #endif
 
-#ifdef WITH_PTHREADS
-#  include <pthread.h>
-#endif				/* WITH_PTHREADS */
-
 #if HAVE_SYS_PRCTL_H
 #  include <sys/prctl.h>
 #endif
 
 #include <grp.h>
 #include <errno.h>
+#include <pthread.h>
 #include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -781,17 +778,10 @@ static void  _init_config(void)
 	slurmctld_config.shutdown_time  = (time_t) 0;
 	slurmctld_config.thread_id_main = pthread_self();
 	slurmctld_config.scheduling_disabled = false;
-#ifdef WITH_PTHREADS
 	slurm_mutex_init(&slurmctld_config.thread_count_lock);
 	slurmctld_config.thread_id_main    = (pthread_t) 0;
 	slurmctld_config.thread_id_sig     = (pthread_t) 0;
 	slurmctld_config.thread_id_rpc     = (pthread_t) 0;
-#else
-	slurmctld_config.thread_count_lock = 0;
-	slurmctld_config.thread_id_main    = 0;
-	slurmctld_config.thread_id_sig     = 0;
-	slurmctld_config.thread_id_rpc     = 0;
-#endif
 }
 
 /* Read configuration file.
diff --git a/src/slurmctld/locks.c b/src/slurmctld/locks.c
index 6057473fc205d8f08899e20f49ffe64fccc32eed..7d13c39025a629ca9adb9e72bec8248d3c396dff 100644
--- a/src/slurmctld/locks.c
+++ b/src/slurmctld/locks.c
@@ -41,11 +41,8 @@
 #  include "config.h"
 #endif
 
-#ifdef WITH_PTHREADS
-#  include <pthread.h>
-#endif
-
 #include <errno.h>
+#include <pthread.h>
 #include <string.h>
 #include <sys/types.h>
 
diff --git a/src/slurmctld/ping_nodes.c b/src/slurmctld/ping_nodes.c
index b3f6ddc39ba8357ffaa0020a25ecc5ae205d8373..a3dddf62a9afd7acfe08b524e2492612a3980927 100644
--- a/src/slurmctld/ping_nodes.c
+++ b/src/slurmctld/ping_nodes.c
@@ -41,10 +41,7 @@
 #  include "config.h"
 #endif
 
-#ifdef WITH_PTHREADS
-#  include <pthread.h>
-#endif
-
+#include <pthread.h>
 #include <time.h>
 #include <string.h>
 
diff --git a/src/slurmctld/proc_req.c b/src/slurmctld/proc_req.c
index 9da045299325f020160156f259be36953489cc74..4590cb01284704aba6ba643f6333ba919d42372c 100644
--- a/src/slurmctld/proc_req.c
+++ b/src/slurmctld/proc_req.c
@@ -41,11 +41,8 @@
 #  include "config.h"
 #endif
 
-#ifdef WITH_PTHREADS
-#  include <pthread.h>
-#endif				/* WITH_PTHREADS */
-
 #include <errno.h>
+#include <pthread.h>
 #include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/src/slurmctld/reservation.c b/src/slurmctld/reservation.c
index d1e28be29c0186577fd6b3ec53dadee84dfa1d15..b8f6aaded136b2aba3342ec4ede513c040f622d5 100644
--- a/src/slurmctld/reservation.c
+++ b/src/slurmctld/reservation.c
@@ -41,18 +41,15 @@
 #  include "config.h"
 #endif
 
-#ifdef WITH_PTHREADS
-#  include <pthread.h>
-#endif				/* WITH_PTHREADS */
-
 #include <fcntl.h>
+#include <pthread.h>
 #include <signal.h>
 #include <string.h>
 #include <stdlib.h>
-#include <time.h>
-#include <unistd.h>
 #include <sys/stat.h>
 #include <sys/types.h>
+#include <time.h>
+#include <unistd.h>
 
 #include "slurm/slurm.h"
 #include "slurm/slurm_errno.h"
diff --git a/src/slurmctld/slurmctld.h b/src/slurmctld/slurmctld.h
index 11d731ffd77e5c9a2a1ee62aefd7022a339f846a..b4daa62bf61784a19d51db8891bcfdc82c0d68bb 100644
--- a/src/slurmctld/slurmctld.h
+++ b/src/slurmctld/slurmctld.h
@@ -142,21 +142,12 @@ typedef struct slurmctld_config {
 	bool scheduling_disabled;
 
 	slurm_cred_ctx_t cred_ctx;
-#ifdef WITH_PTHREADS
 	pthread_mutex_t thread_count_lock;
 	pthread_t thread_id_main;
 	pthread_t thread_id_save;
 	pthread_t thread_id_sig;
 	pthread_t thread_id_power;
 	pthread_t thread_id_rpc;
-#else
-	int thread_count_lock;
-	int thread_id_main;
-	int thread_id_save;
-	int thread_id_sig;
-	int thread_id_power;
-	int thread_id_rpc;
-#endif
 } slurmctld_config_t;
 
 /* Job scheduling statistics */
diff --git a/src/slurmctld/state_save.c b/src/slurmctld/state_save.c
index 3f9d15e95ca8ce06efc94fee38c1ecdaa10fdbef..ca066298bce2e031d964fa20968b486d97a28969 100644
--- a/src/slurmctld/state_save.c
+++ b/src/slurmctld/state_save.c
@@ -45,9 +45,7 @@
 #include <sys/prctl.h>
 #endif
 
-#ifdef WITH_PTHREADS
-#  include <pthread.h>
-#endif                          /* WITH_PTHREADS */
+#include <pthread.h>
 
 #include "src/common/macros.h"
 #include "src/slurmctld/front_end.h"
diff --git a/src/slurmctld/trigger_mgr.c b/src/slurmctld/trigger_mgr.c
index f5806e41a7c66ccc8ef6a31603fd22fe60e85e55..51c3c64d20e573d44853250fa312c0883b5f8df5 100644
--- a/src/slurmctld/trigger_mgr.c
+++ b/src/slurmctld/trigger_mgr.c
@@ -41,14 +41,11 @@
 #  include "config.h"
 #endif
 
-#ifdef WITH_PTHREADS
-#  include <pthread.h>
-#endif
-
 #include <ctype.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <grp.h>
+#include <pthread.h>
 #include <signal.h>
 #include <stdlib.h>
 #include <sys/types.h>
diff --git a/src/slurmd/slurmstepd/slurmstepd_job.h b/src/slurmd/slurmstepd/slurmstepd_job.h
index 25eefb94776e5ce15491fca84ef51f0fbbcb52a5..d765e57512382c00a554231e40daad0f2706377d 100644
--- a/src/slurmd/slurmstepd/slurmstepd_job.h
+++ b/src/slurmd/slurmstepd/slurmstepd_job.h
@@ -41,10 +41,7 @@
 #ifndef _SLURMSTEPD_JOB_H
 #define _SLURMSTEPD_JOB_H
 
-#if WITH_PTHREADS
 #include <pthread.h>
-#endif
-
 #include <pwd.h>
 
 #include "src/common/macros.h"
diff --git a/src/srun/libsrun/srun_job.h b/src/srun/libsrun/srun_job.h
index e7d472376957b01bcb144db17d72d328c4b1245f..8f0d0d8664f7400dcfc12365652e21e33b867228 100644
--- a/src/srun/libsrun/srun_job.h
+++ b/src/srun/libsrun/srun_job.h
@@ -38,11 +38,8 @@
 #ifndef _HAVE_JOB_H
 #define _HAVE_JOB_H
 
-#ifdef WITH_PTHREADS
-#  include <pthread.h>
-#endif
-
 #include <netinet/in.h>
+#include <pthread.h>
 
 #include "slurm/slurm.h"
 
diff --git a/src/srun/srun.c b/src/srun/srun.c
index 81c07b3ac474b90ddee0135b8f0c0b7fc51397b4..58685aaa1d76a90cd601557bea9de6056f019abd 100644
--- a/src/srun/srun.c
+++ b/src/srun/srun.c
@@ -42,9 +42,6 @@
 #  include "config.h"
 #endif
 
-#ifdef WITH_PTHREADS
-#  include <pthread.h>
-#endif
 
 #ifdef HAVE_AIX
 #  undef HAVE_UNSETENV
@@ -54,6 +51,14 @@
 #  include "src/common/unsetenv.h"
 #endif
 
+#include <ctype.h>
+#include <fcntl.h>
+#include <grp.h>
+#include <pthread.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <signal.h>
 #include <sys/param.h>
 #include <sys/resource.h>
 #include <sys/stat.h>
@@ -61,15 +66,8 @@
 #include <sys/types.h>
 #include <sys/utsname.h>
 #include <sys/wait.h>
-#include <ctype.h>
-#include <fcntl.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <signal.h>
 #include <termios.h>
 #include <unistd.h>
-#include <grp.h>
 
 #include "src/common/fd.h"