diff --git a/src/flib/piodarray.F90.in b/src/flib/piodarray.F90.in
index c03f85529ca..114ddb84bbe 100644
--- a/src/flib/piodarray.F90.in
+++ b/src/flib/piodarray.F90.in
@@ -1,7 +1,10 @@
-#define __PIO_FILE__ 'piodarray'
 !>
 !! @file
 !! @brief Read and write routines for decomposed data.
+
+!> @cond
+#define __PIO_FILE__ 'piodarray'
+!> @endcond
 module piodarray
   use pio_types, only : file_desc_t, io_desc_t, var_desc_t
   use pio_kinds, only : i4, r4, r8, pio_offset_kind
diff --git a/src/flib/piolib_mod.F90 b/src/flib/piolib_mod.F90
index e669b6fdb11..a3d3ea1b2a1 100644
--- a/src/flib/piolib_mod.F90
+++ b/src/flib/piolib_mod.F90
@@ -1,5 +1,4 @@
 #define __PIO_FILE__ "piolib_mod.f90"
-#define debug_rearr 0
 !>
 !! @file
 !! @brief Initialization Routines for PIO
diff --git a/src/flib/pionfatt_mod.F90.in b/src/flib/pionfatt_mod.F90.in
index 82709f59188..1b50c13ef9c 100644
--- a/src/flib/pionfatt_mod.F90.in
+++ b/src/flib/pionfatt_mod.F90.in
@@ -337,7 +337,6 @@ contains
 
   end function put_att_1d_vid_{TYPE}
 
-
   !>
   !! @public
   !! @ingroup PIO_get_att