diff --git a/src/slurmctld/controller.c b/src/slurmctld/controller.c
index fdd83f80b39e63df76ed64e95c8d93a5fa46e416..f5f1871c06981dcff868e65cf90d263fc1c152d9 100644
--- a/src/slurmctld/controller.c
+++ b/src/slurmctld/controller.c
@@ -21,7 +21,7 @@
 #include <netinet/in.h>
 #include <unistd.h>
 
-#include "slurm.h"
+#include "slurmctld.h"
 #include "pack.h"
 
 #define BUF_SIZE 1024
diff --git a/src/slurmctld/job_mgr.c b/src/slurmctld/job_mgr.c
index d9639623b58db5a7eef67e7ff9bd75380be95669..c14e31895731b1f36f83edc6894450fce517ded1 100644
--- a/src/slurmctld/job_mgr.c
+++ b/src/slurmctld/job_mgr.c
@@ -17,7 +17,7 @@
 
 #include "list.h"
 #include "pack.h"
-#include "slurm.h"
+#include "slurmctld.h"
 
 #define BUF_SIZE 1024
 #define MAX_STR_PACK 128
diff --git a/src/slurmctld/job_scheduler.c b/src/slurmctld/job_scheduler.c
index a70ad24b2241ed1816190639db9de959f614ba5e..8f3d6405687879d34602b4f0087cbc1c8e7a3f9b 100644
--- a/src/slurmctld/job_scheduler.c
+++ b/src/slurmctld/job_scheduler.c
@@ -14,7 +14,7 @@
 #include <string.h>
 
 #include "list.h"
-#include "slurm.h"
+#include "slurmctld.h"
 
 struct job_queue {
 	int priority;
diff --git a/src/slurmctld/node_mgr.c b/src/slurmctld/node_mgr.c
index 61b6bf90794a11961ff9317193502ce78d22433c..7528ed47477982b6f367fa6891efe2b6c7530f98 100644
--- a/src/slurmctld/node_mgr.c
+++ b/src/slurmctld/node_mgr.c
@@ -14,7 +14,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "slurm.h"
+#include "slurmctld.h"
 
 #define BUF_SIZE 	1024
 #define SEPCHARS 	" \n\t"
diff --git a/src/slurmctld/node_scheduler.c b/src/slurmctld/node_scheduler.c
index 90d73ea391566283248071b727035b1640ea2c44..eb4ee43b32036cacf90aa6c726768c54e8474b56 100644
--- a/src/slurmctld/node_scheduler.c
+++ b/src/slurmctld/node_scheduler.c
@@ -18,7 +18,7 @@
 #include <string.h>
 #include <syslog.h>
 
-#include "slurm.h"
+#include "slurmctld.h"
 
 #define BUF_SIZE 1024
 
diff --git a/src/slurmctld/partition_mgr.c b/src/slurmctld/partition_mgr.c
index 7edf0d91e955b586b6f379996712b4a1cf238343..9d1b52069c06cd93e0efe4fb6f7883c5af935f25 100644
--- a/src/slurmctld/partition_mgr.c
+++ b/src/slurmctld/partition_mgr.c
@@ -16,7 +16,7 @@
 #include <string.h>
 
 #include "list.h"
-#include "slurm.h"
+#include "slurmctld.h"
 
 #define BUF_SIZE 1024
 #define SEPCHARS " \n\t"
diff --git a/src/slurmctld/read_config.c b/src/slurmctld/read_config.c
index 6a99ad33d2ed90c0e61de8c72ae9ab3766681c77..6bcc51ad9c947da4ebc2edd7423b6a45cefc4f5d 100644
--- a/src/slurmctld/read_config.c
+++ b/src/slurmctld/read_config.c
@@ -20,7 +20,7 @@
 #include <syslog.h>
 #include <unistd.h>
 
-#include "slurm.h"
+#include "slurmctld.h"
 #include "list.h"
 
 #define BUF_SIZE 1024
@@ -30,6 +30,7 @@ int parse_part_spec (char *in_line);
 
 char *backup_controller = NULL;
 char *control_machine = NULL;
+int node_record_count = 0;
 
 #if DEBUG_MODULE
 /* main is used here for module testing purposes only */
@@ -149,6 +150,34 @@ main (int argc, char *argv[]) {
 #endif
 
 
+/* 
+ * report_leftover - report any un-parsed (non-whitespace) characters on the
+ * configuration input line.
+ * input: in_line - what is left of the configuration input line.
+ *        line_num - line number of the configuration file.
+ * output: none
+ */
+static void
+report_leftover (char *in_line, int line_num)
+{
+	int bad_index, i;
+
+	bad_index = -1;
+	for (i = 0; i < strlen (in_line); i++) {
+		if (isspace ((int) in_line[i]) || (in_line[i] == '\n'))
+			continue;
+		bad_index = i;
+		break;
+	}
+
+	if (bad_index == -1)
+		return;
+	error ("report_leftover: ignored input on line %d of configuration: %s",
+			line_num, &in_line[bad_index]);
+	return;
+}
+
+
 /*
  * build_bitmaps - build node bitmaps to define which nodes are in which 
  *    1) partition  2) configuration record  3) up state  4) idle state
diff --git a/src/slurmctld/step_mgr.c b/src/slurmctld/step_mgr.c
index c61ae7f3259d255b33e425a16729361e65aed967..d55d76af5a4f9063b3f46542f4187b5123e3f8e0 100644
--- a/src/slurmctld/step_mgr.c
+++ b/src/slurmctld/step_mgr.c
@@ -17,7 +17,7 @@
 
 #include "list.h"
 #include "pack.h"
-#include "slurm.h"
+#include "slurmctld.h"
 
 #define BUF_SIZE 1024