diff --git a/src/add-ons/accelerants/radeon_hd/Jamfile b/src/add-ons/accelerants/radeon_hd/Jamfile
index 4d153d23d2..946d61b464 100644
--- a/src/add-ons/accelerants/radeon_hd/Jamfile
+++ b/src/add-ons/accelerants/radeon_hd/Jamfile
@@ -1,7 +1,5 @@
 SubDir HAIKU_TOP src add-ons accelerants radeon_hd ;
 
-SubInclude HAIKU_TOP src add-ons accelerants radeon_hd atombios ;
-
 SetSubDirSupportedPlatformsBeOSCompatible ;
 
 UsePrivateHeaders graphics ;
@@ -16,7 +14,4 @@ Addon radeon_hd.accelerant :
 	: be libaccelerantscommon.a atombios.a
 ;
 
-Package haiku-radeon_hd-cvs :
-	radeon_hd.accelerant :
-	boot home config add-ons accelerants ;
-
+SubInclude HAIKU_TOP src add-ons accelerants radeon_hd atombios ;
diff --git a/src/add-ons/accelerants/radeon_hd/atombios/Decoder.c b/src/add-ons/accelerants/radeon_hd/atombios/Decoder.c
index e53fee855a..95908d5fe6 100644
--- a/src/add-ons/accelerants/radeon_hd/atombios/Decoder.c
+++ b/src/add-ons/accelerants/radeon_hd/atombios/Decoder.c
@@ -40,9 +40,6 @@ 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
index 464337cb65..ed131becff 100644
--- a/src/add-ons/accelerants/radeon_hd/atombios/Jamfile
+++ b/src/add-ons/accelerants/radeon_hd/atombios/Jamfile
@@ -5,8 +5,9 @@ UsePrivateHeaders graphics ;
 UsePrivateHeaders [ FDirName graphics radeon_hd ] ;
 UsePrivateHeaders [ FDirName graphics common ] ;
 
+DEFINES += DISABLE_EASF ;
+
 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 1c8c969007..d1304511c9 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,10 +37,41 @@ Revision History:
 #ifndef _COMMON_TYPES_H_
 	#define _COMMON_TYPES_H_
 
-#if defined (__HAIKU__)
-	// It's how we roll
-	#include <stdint.h>
+// HAIKU_ADDITION START IF
+#if defined(__HAIKU__)
+	#include <stdint.h> 
+#else
+    #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;
 #endif
+		typedef unsigned short      uint16_t;
+		typedef signed short        int16_t;
+	#endif
+
+#endif
+// HAIKU_ADDITION ENDIF
 
 #ifndef	UEFI_BUILD
 		typedef signed int			intn_t;
@@ -51,6 +82,9 @@ Revision History:
 		typedef unsigned int		uintn_t;
 #endif
 #endif
+#ifndef FGL_LINUX
+#pragma warning ( disable : 4142 )
+#endif
 
 
 #ifndef VOID
@@ -122,6 +156,9 @@ typedef unsigned long ULONG_PTR;
 //typedef	UINTN		CD_STATUS;
 
 
+#ifndef FGL_LINUX
+#pragma warning ( default : 4142 )
+#endif
 #endif // _COMMON_TYPES_H_
 
 // EOF