diff --git a/src/api/slurm.h b/src/api/slurm.h
index 84e330ee1278049482772bfe0a37c8dd214f62e0..56f4513c6c7b48f255d80b9f380006856d917f64 100644
--- a/src/api/slurm.h
+++ b/src/api/slurm.h
@@ -28,7 +28,7 @@
 #ifndef _SLURM_H
 #define _SLURM_H
 
-/* FIXME: REMOVE ASAP */
+/* FIXME: Need better way to pick up uint16_t, uint32_t, etc. */
 #if HAVE_CONFIG_H
 #  include <config.h>
 #  if HAVE_INTTYPES_H
@@ -38,20 +38,12 @@
 #      include <stdint.h>
 #    endif
 #  endif			/* HAVE_INTTYPES_H */
-#  ifdef HAVE_LIBELAN3
-#    include <src/common/qsw.h>
-#  endif
 #else				/* !HAVE_CONFIG_H */
 #  include <inttypes.h>
 #endif				/*  HAVE_CONFIG_H */
 
-#include <src/common/macros.h>
-#include <src/common/xassert.h>
-#include <src/common/slurm_protocol_common.h>
-
-
-#include <stdio.h>			/* for FILE definitions */
-#include <time.h>			/* for time_t definitions */
+#include <stdio.h>		/* for FILE definitions */
+#include <time.h>		/* for time_t definitions */
 
 /* FIXME: Need better way to define qsw_jobinfo_t */
 #ifdef	HAVE_LIBELAN3