diff --git a/src/add-ons/opengl/mesa_software_renderer/Jamfile b/src/add-ons/opengl/mesa_software_renderer/Jamfile
index 19d5c4dae1..db0aa3f361 100644
--- a/src/add-ons/opengl/mesa_software_renderer/Jamfile
+++ b/src/add-ons/opengl/mesa_software_renderer/Jamfile
@@ -13,11 +13,7 @@ if $(TARGET_PLATFORM) != haiku {
         defines = BEOS_THREADS GNU_ASSEMBLER ;
 
         if $(TARGET_ARCH) = x86 {
-                defines += USE_X86_ASM USE_MMX_ASM USE_3DNOW_ASM ; 
-		if $(TARGET_PLATFORM != haiku) {
-			# FIXME: Remove me when Haiku SSE support will be fixed.
-			defines += USE_SSE_ASM ;
-		}
+                defines += USE_X86_ASM USE_MMX_ASM USE_3DNOW_ASM USE_SSE_ASM ; 
         } else {
                 # Not yet supported, as current Mesa3D PPC assembly is Linux-dependent!
                 # defines += USE_PPC_ASM ;
diff --git a/src/kits/opengl/Jamfile b/src/kits/opengl/Jamfile
index aad9ee919f..3c405491fa 100644
--- a/src/kits/opengl/Jamfile
+++ b/src/kits/opengl/Jamfile
@@ -25,11 +25,7 @@ UseHeaders [ FDirName $(SUBDIR) mesa swrast_setup ] ;
 	defines = BEOS_THREADS GNU_ASSEMBLER ;
 
 	if $(TARGET_ARCH) = x86 {
-		defines += USE_X86_ASM USE_MMX_ASM USE_3DNOW_ASM ; 
-		if $(TARGET_PLATFORM) != haiku {
-			# FIXME: Remove me when Haiku SSE support will be fixed.
-			defines += USE_SSE_ASM ;
-		}
+		defines += USE_X86_ASM USE_MMX_ASM USE_3DNOW_ASM USE_SSE_ASM ;
 	} else if $(TARGET_ARCH) = ppc {
 		# Not yet supported, as current Mesa3D PPC assembly is Linux-dependent!
 		# defines += USE_PPC_ASM ;
diff --git a/src/kits/opengl/mesa/Jamfile b/src/kits/opengl/mesa/Jamfile
index 1c847b619f..67b423bd0e 100644
--- a/src/kits/opengl/mesa/Jamfile
+++ b/src/kits/opengl/mesa/Jamfile
@@ -61,11 +61,7 @@ actions MkMaTypes1
 	defines = BEOS_THREADS GNU_ASSEMBLER ;
 
 	if $(TARGET_ARCH) = x86 {
-		defines += USE_X86_ASM USE_MMX_ASM USE_3DNOW_ASM ; 
-		if $(TARGET_PLATFORM) != haiku {
-			# FIXME: Remove me when Haiku SSE support will be fixed.
-			defines += USE_SSE_ASM ;
-		}
+		defines += USE_X86_ASM USE_MMX_ASM USE_3DNOW_ASM USE_SSE_ASM ;
 	} else {
 		# Not yet supported, as current Mesa3D PPC assembly is Linux-dependent!
 		# defines += USE_PPC_ASM ;