diff --git a/ChangeLog b/ChangeLog
index 8362e08557..bf7998bdf6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2014-11-24  Siddhesh Poyarekar  <siddhesh@redhat.com>
 
+	* include/bits/stdlib-float.h: Use IS_IN only if _ISOMAC is
+	defined.
+	* include/mqueue.h: Likewise.
+	* include/stdlib.h: Likewise.
+
 	* stdlib/isomac.c (fmt): Replace NOT_IN_libc with IN_MODULE.
 	(get_null_defines): Adjust.
 	* sunrpc/Makefile: Adjust comment.
diff --git a/include/bits/stdlib-float.h b/include/bits/stdlib-float.h
index 346631482d..54ab571981 100644
--- a/include/bits/stdlib-float.h
+++ b/include/bits/stdlib-float.h
@@ -1,4 +1,8 @@
-/* No floating-point inline functions in rtld.  */
-#if !IS_IN (rtld)
+/* No floating-point inline functions in rtld and for the conform tests.  */
+#ifdef _ISOMAC
 # include <stdlib/bits/stdlib-float.h>
+#else
+# if !IS_IN (rtld)
+#  include <stdlib/bits/stdlib-float.h>
+# endif
 #endif
diff --git a/include/mqueue.h b/include/mqueue.h
index aba788e803..eb47b9b34e 100644
--- a/include/mqueue.h
+++ b/include/mqueue.h
@@ -1,7 +1,9 @@
 #include <rt/mqueue.h>
 
-#if IS_IN (librt)
+#ifndef _ISOMAC
+# if IS_IN (librt)
 hidden_proto (mq_timedsend)
 hidden_proto (mq_timedreceive)
 hidden_proto (mq_setattr)
+# endif
 #endif