diff --git a/src/util/GNUmakefile b/src/util/GNUmakefile
index 991ae2a657..a6f913f328 100644
--- a/src/util/GNUmakefile
+++ b/src/util/GNUmakefile
@@ -254,6 +254,7 @@ endif
 ifeq ($(TARGET),$(findstring $(TARGET),BGL BGP BGQ))
 DEFINES += -DNEED_LOC
 LIB_DEFINES += -DNO_UTIL_TESTS
+LIB_DEFINES += -I/bgsys/drivers/ppcfloor/firmware/include -I/bgsys/drivers/ppcfloor/spi/include/kernel
 endif
 
 ifdef SLURM
diff --git a/src/util/util_getppn.c b/src/util/util_getppn.c
index ad0bbce923..39bfa81018 100644
--- a/src/util/util_getppn.c
+++ b/src/util/util_getppn.c
@@ -31,8 +31,10 @@ static short int ppn_initialized=0;
 static int ppn=0;
 void FATR util_getppn_(Integer *ppn_out){
 
-#if defined(__bgq__)
-    *ppn_out = Kernel_ProcessCount();
+#if defined(__bgqz__)
+  *ppn_out = (Integer) Kernel_ProcessCount();
+  return;
+  if(0) {
 #elif MPI_VERSION >= 3
 
     int err;