diff --git a/samples/common/hsatimer.h b/samples/common/hsatimer.h
index b37f46c623..be6e177ab2 100644
--- a/samples/common/hsatimer.h
+++ b/samples/common/hsatimer.h
@@ -16,15 +16,15 @@
 using namespace std;
 
 #if defined(__GNUC__)
-#include <sys/time.h>
-#include <x86intrin.h>
-#endif
-
-#if defined(_MSC_VER)
-#include <time.h>
-#include <windows.h>
-#include <intrin.h>
-#endif
+  #include <sys/time.h>
+  #include <x86intrin.h>
+#else
+  #if defined(_MSC_VER)
+    #include <time.h>
+    #include <windows.h>
+    #include <intrin.h>
+  #endif // _MSC_VER
+#endif // __GNUC__
 
 #define HSA_FAILURE  1
 #define HSA_SUCCESS 0