diff --git a/src/apps/haiku3d/Jamfile b/src/apps/haiku3d/Jamfile
index b2f5d708b1..63d104b640 100644
--- a/src/apps/haiku3d/Jamfile
+++ b/src/apps/haiku3d/Jamfile
@@ -22,6 +22,6 @@ Application Haiku3d :
 	BitmapTexture.cpp
 	VideoFileTexture.cpp
 
-	: be game GL media translation $(TARGET_LIBSUPC++)
+	: be game GL media translation $(TARGET_LIBSTDC++)
 	: Haiku3d.rdef
 ;
diff --git a/src/system/libroot/posix/glibc/include/bits/stdio-lock.h b/src/system/libroot/posix/glibc/include/bits/stdio-lock.h
index b6eb98d921..8d865b63af 100644
--- a/src/system/libroot/posix/glibc/include/bits/stdio-lock.h
+++ b/src/system/libroot/posix/glibc/include/bits/stdio-lock.h
@@ -27,7 +27,7 @@ __libc_lock_define_recursive (typedef, _IO_lock_t)
 /* We need recursive (counting) mutexes.  */
 #ifdef _LIBC_LOCK_RECURSIVE_INITIALIZER
 # define _IO_lock_initializer _LIBC_LOCK_RECURSIVE_INITIALIZER
-#elif _IO_MTSAFE_IO
+#elif defined _IO_MTSAFE_IO
  #error libio needs recursive mutexes for _IO_MTSAFE_IO
 #endif