diff --git a/headers/private/graphics/common/video_configuration.h b/headers/private/graphics/common/video_configuration.h
index 57bf96e5eb..e565d97b73 100644
--- a/headers/private/graphics/common/video_configuration.h
+++ b/headers/private/graphics/common/video_configuration.h
@@ -9,6 +9,9 @@
 #define _VIDEO_CONFIGURATION_H
 
 
+#include <SupportDefs.h>
+
+
 // Video connector types
 #define VIDEO_CONNECTOR_UNKNOWN 	0x00
 #define VIDEO_CONNECTOR_VGA			0x01
diff --git a/src/add-ons/accelerants/radeon_hd/accelerant.cpp b/src/add-ons/accelerants/radeon_hd/accelerant.cpp
index db3af92a8a..823dbd6c71 100644
--- a/src/add-ons/accelerants/radeon_hd/accelerant.cpp
+++ b/src/add-ons/accelerants/radeon_hd/accelerant.cpp
@@ -7,9 +7,18 @@
  *		Alexander von Gluck, kallisti5@unixzen.com
  */
 
+#include "accelerant.h"
+
+#include <AGP.h>
+#include <Debug.h>
+#include <errno.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <syslog.h>
+#include <unistd.h>
 
 #include "accelerant_protos.h"
-#include "accelerant.h"
 
 #include "bios.h"
 #include "connector.h"
@@ -18,17 +27,6 @@
 #include "pll.h"
 #include "utility.h"
 
-#include <Debug.h>
-
-#include <errno.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
-#include <syslog.h>
-
-#include <AGP.h>
-
 
 #undef TRACE
 
diff --git a/src/add-ons/accelerants/radeon_hd/accelerant.h b/src/add-ons/accelerants/radeon_hd/accelerant.h
index 7a01e88b5c..1543623191 100644
--- a/src/add-ons/accelerants/radeon_hd/accelerant.h
+++ b/src/add-ons/accelerants/radeon_hd/accelerant.h
@@ -10,15 +10,14 @@
 #define RADEON_HD_ACCELERANT_H
 
 
+#include <ByteOrder.h>
+#include <edid.h>
+
 #include "atom.h"
 #include "encoder.h"
 #include "mode.h"
-#include "radeon_hd.h"
 #include "pll.h"
-
-
-#include <ByteOrder.h>
-#include <edid.h>
+#include "radeon_hd.h"
 
 
 #define MAX_DISPLAY 2
diff --git a/src/add-ons/accelerants/radeon_hd/accelerant_protos.h b/src/add-ons/accelerants/radeon_hd/accelerant_protos.h
index 8c17ccc957..b6152cb3a6 100644
--- a/src/add-ons/accelerants/radeon_hd/accelerant_protos.h
+++ b/src/add-ons/accelerants/radeon_hd/accelerant_protos.h
@@ -11,6 +11,7 @@
 
 
 #include <Accelerant.h>
+
 #include "video_overlay.h"
 
 
diff --git a/src/add-ons/accelerants/radeon_hd/atombios/atom.h b/src/add-ons/accelerants/radeon_hd/atombios/atom.h
index 2644cb1c4f..9e4ee72c3c 100644
--- a/src/add-ons/accelerants/radeon_hd/atombios/atom.h
+++ b/src/add-ons/accelerants/radeon_hd/atombios/atom.h
@@ -28,9 +28,10 @@
 #include "atombios.h"
 #include "ObjectID.h"
 
+#include <ByteOrder.h>
+#include <kernel/OS.h>
 #include <String.h>
 #include <SupportDefs.h>
-#include <ByteOrder.h>
 
 
 struct card_info {
diff --git a/src/add-ons/accelerants/radeon_hd/bios.cpp b/src/add-ons/accelerants/radeon_hd/bios.cpp
index e1b6b23afe..813a6aea95 100644
--- a/src/add-ons/accelerants/radeon_hd/bios.cpp
+++ b/src/add-ons/accelerants/radeon_hd/bios.cpp
@@ -7,10 +7,10 @@
  */
 
 
-#include <Debug.h>
-
 #include "bios.h"
 
+#include <Debug.h>
+
 #include "accelerant.h"
 #include "accelerant_protos.h"
 
diff --git a/src/add-ons/accelerants/radeon_hd/connector.cpp b/src/add-ons/accelerants/radeon_hd/connector.cpp
index 89837418cc..63c2e1c617 100644
--- a/src/add-ons/accelerants/radeon_hd/connector.cpp
+++ b/src/add-ons/accelerants/radeon_hd/connector.cpp
@@ -7,15 +7,17 @@
  */
 
 
+#include "connector.h"
+
+#include <Debug.h>
+
 #include "accelerant_protos.h"
 #include "accelerant.h"
 #include "bios.h"
-#include "connector.h"
+#include "encoder.h"
 #include "gpu.h"
 #include "utility.h"
 
-#include <Debug.h>
-
 
 #undef TRACE
 
diff --git a/src/add-ons/accelerants/radeon_hd/connector.h b/src/add-ons/accelerants/radeon_hd/connector.h
index 1efd17841c..2ba5c789d3 100644
--- a/src/add-ons/accelerants/radeon_hd/connector.h
+++ b/src/add-ons/accelerants/radeon_hd/connector.h
@@ -11,6 +11,8 @@
 
 #include <video_configuration.h>
 
+#include "accelerant.h"
+
 
 // From the VESA DisplayPort spec
 // TODO: may want to move these into common code
diff --git a/src/add-ons/accelerants/radeon_hd/display.cpp b/src/add-ons/accelerants/radeon_hd/display.cpp
index 165e361c35..1555e0ee68 100644
--- a/src/add-ons/accelerants/radeon_hd/display.cpp
+++ b/src/add-ons/accelerants/radeon_hd/display.cpp
@@ -12,15 +12,17 @@
  */
 
 
-#include "accelerant_protos.h"
-#include "accelerant.h"
-#include "bios.h"
-#include "connector.h"
 #include "display.h"
 
 #include <stdlib.h>
 #include <string.h>
 
+#include "accelerant.h"
+#include "accelerant_protos.h"
+#include "bios.h"
+#include "connector.h"
+#include "encoder.h"
+
 
 #define TRACE_DISPLAY
 #ifdef TRACE_DISPLAY
diff --git a/src/add-ons/accelerants/radeon_hd/display.h b/src/add-ons/accelerants/radeon_hd/display.h
index 4e6c135f11..ed13d1b620 100644
--- a/src/add-ons/accelerants/radeon_hd/display.h
+++ b/src/add-ons/accelerants/radeon_hd/display.h
@@ -11,6 +11,8 @@
 
 #include <video_configuration.h>
 
+#include "accelerant.h"
+
 
 status_t init_registers(register_info* reg, uint8 crtid);
 status_t detect_crt_ranges(uint32 crtid);
diff --git a/src/add-ons/accelerants/radeon_hd/encoder.cpp b/src/add-ons/accelerants/radeon_hd/encoder.cpp
index 5181ea793d..8460d0c82c 100644
--- a/src/add-ons/accelerants/radeon_hd/encoder.cpp
+++ b/src/add-ons/accelerants/radeon_hd/encoder.cpp
@@ -7,17 +7,19 @@
  */
 
 
-#include "accelerant_protos.h"
-#include "accelerant.h"
-#include "bios.h"
-#include "display.h"
-#include "utility.h"
+#include "encoder.h"
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <math.h>
 
+#include "accelerant.h"
+#include "accelerant_protos.h"
+#include "bios.h"
+#include "display.h"
+#include "utility.h"
+
 
 #define TRACE_ENCODER
 #ifdef TRACE_ENCODER
diff --git a/src/add-ons/accelerants/radeon_hd/encoder.h b/src/add-ons/accelerants/radeon_hd/encoder.h
index 66d5137cda..5d26d0f078 100644
--- a/src/add-ons/accelerants/radeon_hd/encoder.h
+++ b/src/add-ons/accelerants/radeon_hd/encoder.h
@@ -9,6 +9,9 @@
 #define RADEON_HD_ENCODER_H
 
 
+#include <SupportDefs.h>
+
+
 void encoder_assign_crtc(uint8 crtID);
 void encoder_apply_quirks(uint8 crtcID);
 void encoder_mode_set(uint8 id, uint32 pixelClock);
diff --git a/src/add-ons/accelerants/radeon_hd/gpu.cpp b/src/add-ons/accelerants/radeon_hd/gpu.cpp
index 5fec816013..c498449db5 100644
--- a/src/add-ons/accelerants/radeon_hd/gpu.cpp
+++ b/src/add-ons/accelerants/radeon_hd/gpu.cpp
@@ -8,14 +8,15 @@
  */
 
 
+#include "gpu.h"
+
+#include <Debug.h>
+
 #include "accelerant_protos.h"
 #include "accelerant.h"
 #include "bios.h"
-#include "gpu.h"
 #include "utility.h"
 
-#include <Debug.h>
-
 
 #undef TRACE
 
diff --git a/src/add-ons/accelerants/radeon_hd/hooks.cpp b/src/add-ons/accelerants/radeon_hd/hooks.cpp
index 14ed39a2e9..1fa8d39984 100644
--- a/src/add-ons/accelerants/radeon_hd/hooks.cpp
+++ b/src/add-ons/accelerants/radeon_hd/hooks.cpp
@@ -8,8 +8,8 @@
  */
 
 
-#include "accelerant_protos.h"
 #include "accelerant.h"
+#include "accelerant_protos.h"
 
 
 extern "C" void *
diff --git a/src/add-ons/accelerants/radeon_hd/mode.cpp b/src/add-ons/accelerants/radeon_hd/mode.cpp
index 5bb92b9467..bd84413ea7 100644
--- a/src/add-ons/accelerants/radeon_hd/mode.cpp
+++ b/src/add-ons/accelerants/radeon_hd/mode.cpp
@@ -11,19 +11,20 @@
  */
 
 
-#include "accelerant_protos.h"
-#include "accelerant.h"
-#include "bios.h"
-#include "utility.h"
 #include "mode.h"
-#include "display.h"
-#include "pll.h"
 
+#include <create_display_modes.h>
 #include <stdio.h>
 #include <string.h>
 #include <math.h>
 
-#include <create_display_modes.h>
+#include "accelerant.h"
+#include "accelerant_protos.h"
+#include "bios.h"
+#include "display.h"
+#include "encoder.h"
+#include "pll.h"
+#include "utility.h"
 
 
 #define TRACE_MODE
diff --git a/src/add-ons/accelerants/radeon_hd/pll.cpp b/src/add-ons/accelerants/radeon_hd/pll.cpp
index 4fcd54c7d5..7ceb03633c 100644
--- a/src/add-ons/accelerants/radeon_hd/pll.cpp
+++ b/src/add-ons/accelerants/radeon_hd/pll.cpp
@@ -7,11 +7,6 @@
  */
 
 
-#include "accelerant_protos.h"
-#include "accelerant.h"
-#include "bios.h"
-#include "display.h"
-#include "utility.h"
 #include "pll.h"
 
 #include <stdio.h>
@@ -19,6 +14,12 @@
 #include <string.h>
 #include <math.h>
 
+#include "accelerant_protos.h"
+#include "accelerant.h"
+#include "bios.h"
+#include "display.h"
+#include "encoder.h"
+#include "utility.h"
 
 #define TRACE_PLL
 #ifdef TRACE_PLL
diff --git a/src/add-ons/accelerants/radeon_hd/pll.h b/src/add-ons/accelerants/radeon_hd/pll.h
index aebba18df1..99431c0d7c 100644
--- a/src/add-ons/accelerants/radeon_hd/pll.h
+++ b/src/add-ons/accelerants/radeon_hd/pll.h
@@ -9,7 +9,7 @@
 #define RADEON_HD_PLL_H
 
 
-#include "accelerant.h"
+#include <SupportDefs.h>
 
 
 #define MAX_TOLERANCE 10