diff --git a/src/add-ons/accelerants/radeon_hd/gpu.cpp b/src/add-ons/accelerants/radeon_hd/gpu.cpp
index 4c0d63220e..2a37354cd3 100644
--- a/src/add-ons/accelerants/radeon_hd/gpu.cpp
+++ b/src/add-ons/accelerants/radeon_hd/gpu.cpp
@@ -9,11 +9,12 @@
 
 #include "accelerant_protos.h"
 #include "accelerant.h"
-#include "utility.h"
 #include "gpu.h"
+#include "utility.h"
 
 #include <Debug.h>
 
+
 #undef TRACE
 
 #define TRACE_GPU
diff --git a/src/add-ons/accelerants/radeon_hd/gpu.h b/src/add-ons/accelerants/radeon_hd/gpu.h
index d3958f4c46..e8311e4694 100644
--- a/src/add-ons/accelerants/radeon_hd/gpu.h
+++ b/src/add-ons/accelerants/radeon_hd/gpu.h
@@ -5,8 +5,8 @@
  * Authors:
  *      Alexander von Gluck, kallisti5@unixzen.com
  */
-#ifndef RADEON_HD_MC_H
-#define RADEON_HD_MC_H
+#ifndef RADEON_HD_GPU_H
+#define RADEON_HD_GPU_H
 
 
 // GPU Control registers. These are combined as