diff --git a/src/add-ons/accelerants/radeon_hd/Jamfile b/src/add-ons/accelerants/radeon_hd/Jamfile
index c02696a276..4d153d23d2 100644
--- a/src/add-ons/accelerants/radeon_hd/Jamfile
+++ b/src/add-ons/accelerants/radeon_hd/Jamfile
@@ -1,5 +1,7 @@
 SubDir HAIKU_TOP src add-ons accelerants radeon_hd ;
 
+SubInclude HAIKU_TOP src add-ons accelerants radeon_hd atombios ;
+
 SetSubDirSupportedPlatformsBeOSCompatible ;
 
 UsePrivateHeaders graphics ;
@@ -11,7 +13,7 @@ Addon radeon_hd.accelerant :
 	engine.cpp
 	hooks.cpp
 	mode.cpp
-	: be libaccelerantscommon.a
+	: be libaccelerantscommon.a atombios.a
 ;
 
 Package haiku-radeon_hd-cvs :
diff --git a/src/add-ons/accelerants/radeon_hd/atombios/Decoder.c b/src/add-ons/accelerants/radeon_hd/atombios/Decoder.c
index 95908d5fe6..e53fee855a 100644
--- a/src/add-ons/accelerants/radeon_hd/atombios/Decoder.c
+++ b/src/add-ons/accelerants/radeon_hd/atombios/Decoder.c
@@ -40,6 +40,9 @@ Revision History:
 #include "CD_binding.h"
 #include "CD_Common_Types.h"
 
+
+#define DISABLE_EASF
+
 #ifndef DISABLE_EASF
 	#include "easf.h"
 #endif
diff --git a/src/add-ons/accelerants/radeon_hd/atombios/Jamfile b/src/add-ons/accelerants/radeon_hd/atombios/Jamfile
new file mode 100644
index 0000000000..464337cb65
--- /dev/null
+++ b/src/add-ons/accelerants/radeon_hd/atombios/Jamfile
@@ -0,0 +1,12 @@
+SubDir HAIKU_TOP src add-ons accelerants radeon_hd atombios ;
+
+UseHeaders [ FDirName $(SUBDIR) includes ] ;
+UsePrivateHeaders graphics ;
+UsePrivateHeaders [ FDirName graphics radeon_hd ] ;
+UsePrivateHeaders [ FDirName graphics common ] ;
+
+StaticLibrary atombios.a :
+	Decoder.c
+	CD_Operations.c
+;
+
diff --git a/src/add-ons/accelerants/radeon_hd/atombios/includes/CD_Common_Types.h b/src/add-ons/accelerants/radeon_hd/atombios/includes/CD_Common_Types.h
index 32d01ef9f0..1c8c969007 100644
--- a/src/add-ons/accelerants/radeon_hd/atombios/includes/CD_Common_Types.h
+++ b/src/add-ons/accelerants/radeon_hd/atombios/includes/CD_Common_Types.h
@@ -37,34 +37,11 @@ Revision History:
 #ifndef _COMMON_TYPES_H_
 	#define _COMMON_TYPES_H_
 
-    #ifndef LINUX
-	#if _MSC_EXTENSIONS 
-    
-    //
-    // use Microsoft* C complier dependent interger width types 
-    //
-	//    typedef unsigned __int64    uint64_t;
-	//    typedef __int64             int64_t;
-		typedef unsigned __int32    uint32_t;
-		typedef __int32             int32_t;
-#elif defined (__linux__) || defined (__NetBSD__) \
-    || defined(__sun) || defined(__OpenBSD__) \
-    || defined (__FreeBSD__) || defined(__DragonFly__) || defined(__GLIBC__)
-		typedef unsigned int uint32_t;
-		typedef int int32_t;
-	#else
-		typedef unsigned long	    uint32_t;
-		typedef signed long         int32_t;
-	#endif
-		typedef unsigned char       uint8_t;
-#if (defined(__sun) && defined(_CHAR_IS_SIGNED))
-		typedef char                int8_t;
-#else
-		typedef signed char         int8_t;
+#if defined (__HAIKU__)
+	// It's how we roll
+	#include <stdint.h>
 #endif
-		typedef unsigned short      uint16_t;
-		typedef signed short        int16_t;
-	#endif
+
 #ifndef	UEFI_BUILD
 		typedef signed int			intn_t;
 		typedef unsigned int		uintn_t;
@@ -74,9 +51,6 @@ Revision History:
 		typedef unsigned int		uintn_t;
 #endif
 #endif
-#ifndef FGL_LINUX
-#pragma warning ( disable : 4142 )
-#endif
 
 
 #ifndef VOID
@@ -148,9 +122,6 @@ typedef unsigned long ULONG_PTR;
 //typedef	UINTN		CD_STATUS;
 
 
-#ifndef FGL_LINUX
-#pragma warning ( default : 4142 )
-#endif
 #endif // _COMMON_TYPES_H_
 
 // EOF
diff --git a/src/add-ons/accelerants/radeon_hd/atombios/includes/CD_Structs.h b/src/add-ons/accelerants/radeon_hd/atombios/includes/CD_Structs.h
index c43f81dbf6..2d2f7a23be 100644
--- a/src/add-ons/accelerants/radeon_hd/atombios/includes/CD_Structs.h
+++ b/src/add-ons/accelerants/radeon_hd/atombios/includes/CD_Structs.h
@@ -47,13 +47,13 @@ typedef	UINT16*		PTABLE_UNIT_TYPE;
 typedef	UINT16		TABLE_UNIT_TYPE;
 #endif
 
-#include <regsdef.h> //This important file is dynamically generated based on the ASIC!!!!
+#include "regsdef.h" //This important file is dynamically generated based on the ASIC!!!!
 
 #define PARSER_MAJOR_REVISION 5
 #define PARSER_MINOR_REVISION 0
 
 //#include "atombios.h"
-#if (PARSER_TYPE==DRIVER_TYPE_PARSER)
+#if (PARSER_TYPE==DRIVER_TYPE_PARSER) && !defined(__HAIKU__)
 #ifdef FGL_LINUX
 #pragma pack(push,1)
 #else
@@ -457,7 +457,7 @@ typedef struct _INDIRECT_IO_PARSER_COMMANDS
     UINT8             csize;
 } INDIRECT_IO_PARSER_COMMANDS;
 
-#if (PARSER_TYPE==DRIVER_TYPE_PARSER)
+#if (PARSER_TYPE==DRIVER_TYPE_PARSER) && !defined(__HAIKU__)
 #pragma pack(pop)
 #endif