diff --git a/hpvm/test/parboil/benchmarks/lbm/src/visc/lbm.cpp b/hpvm/test/parboil/benchmarks/lbm/src/visc/lbm.cpp
index cf00ad76a285f5209ecee541308d5f18ed356249..323cab871b1faef27055bd61b2d3302ef9503464 100644
--- a/hpvm/test/parboil/benchmarks/lbm/src/visc/lbm.cpp
+++ b/hpvm/test/parboil/benchmarks/lbm/src/visc/lbm.cpp
@@ -16,9 +16,9 @@
 #include <string.h>
 
 // includes, project
+#include "lbm_macros.h"
 #include "layout_config.h"
 #include "lbm.h"
-#include "lbm_macros.h"
 
 /******************************************************************************/
 
diff --git a/hpvm/test/parboil/benchmarks/lbm/src/visc/main.cpp b/hpvm/test/parboil/benchmarks/lbm/src/visc/main.cpp
index b51864366b500fc796d9073fe1893be2f402797f..bb9f6ed1f03d203e412df679775a83c6ff5c349d 100644
--- a/hpvm/test/parboil/benchmarks/lbm/src/visc/main.cpp
+++ b/hpvm/test/parboil/benchmarks/lbm/src/visc/main.cpp
@@ -14,9 +14,9 @@
 #include <sys/stat.h>
 #include <visc.h>
 
+#include "lbm_macros.h"
 #include "layout_config.h"
 #include "lbm.h"
-#include "lbm_macros.h"
 #include "main.h"
 
 #define AS_UINT(x) (*((unsigned *)&(x)))
diff --git a/hpvm/test/parboil/benchmarks/spmv/common_src/convert-dataset/convert_dataset.c b/hpvm/test/parboil/benchmarks/spmv/common_src/convert-dataset/convert_dataset.c
index bf4c1fe9553fd5399c076d91d0bc758734bc2d01..a962e23b8fb24d5416862fb1fafd0b6fa06295fc 100644
--- a/hpvm/test/parboil/benchmarks/spmv/common_src/convert-dataset/convert_dataset.c
+++ b/hpvm/test/parboil/benchmarks/spmv/common_src/convert-dataset/convert_dataset.c
@@ -12,12 +12,13 @@
  *      when reading doubles, otherwise errors will occur.
  */
 
-#include "convert_dataset.h"
-#include "mmio.h"
 #include <math.h>
 #include <stdio.h>
 #include <stdlib.h>
 
+#include "mmio.h"
+#include "convert_dataset.h"
+
 typedef struct _mat_entry {
   int row, col; /* i,j */
   float val;
diff --git a/hpvm/test/parboil/benchmarks/spmv/src/visc/main.cpp b/hpvm/test/parboil/benchmarks/spmv/src/visc/main.cpp
index f6ce5ccfb2412036f4eadcdab419ceca0a6c8f30..4f72d2000afd70a986c8a1c82aa06866e2606511 100644
--- a/hpvm/test/parboil/benchmarks/spmv/src/visc/main.cpp
+++ b/hpvm/test/parboil/benchmarks/spmv/src/visc/main.cpp
@@ -14,9 +14,9 @@
 #include <string.h>
 #include <visc.h>
 
-#include "convert_dataset.h"
 #include "file.h"
 #include "gpu_info.h"
+#include "convert_dataset.h"
 
 #define WARP_BITS 5