diff --git a/src/plugins/slurmctld/nonstop/read_config.h b/src/plugins/slurmctld/nonstop/read_config.h
index 0ab4c4ccb38b847c69cd49e5996f65dc516561da..927293d5dd040571db5f0a2c8a052dc614682ad6 100644
--- a/src/plugins/slurmctld/nonstop/read_config.h
+++ b/src/plugins/slurmctld/nonstop/read_config.h
@@ -55,15 +55,7 @@
 #endif
 
 #define GPL_LICENSED 1
-
-#if defined(__FreeBSD__)
-/* FIXME in the Makefile.am
- */
-#include </usr/local/include/munge.h>
-#else
 #include <munge.h>
-#endif
-
 #include <unistd.h>
 #include <sys/types.h>
 
diff --git a/src/plugins/switch/generic/switch_generic.c b/src/plugins/switch/generic/switch_generic.c
index 109017f6866f4a09fdaa1357dea280c046dd0cc0..02235eb7311076d7446980a2745c3e1e65d73f35 100644
--- a/src/plugins/switch/generic/switch_generic.c
+++ b/src/plugins/switch/generic/switch_generic.c
@@ -40,11 +40,11 @@
 #  include "config.h"
 #endif
 
-#if !defined(__FreeBSD_)
+#if !defined(__FreeBSD__)
 #include <net/if.h>
 #endif
-#include <arpa/inet.h>
 #include <netinet/in.h>
+#include <arpa/inet.h>
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <ifaddrs.h>
@@ -733,6 +733,7 @@ extern int switch_p_get_jobinfo(switch_jobinfo_t *switch_job,
 	int i, s;
 	int bufsize = 1024;
 	char *buf = xmalloc(bufsize);
+
 #if defined(__FreeBSD__)
 #define IFNAMSIZ 16
 #endif