diff --git a/config/ompi_setup_java.m4 b/config/ompi_setup_java.m4
index e29bb55b1e..61e90ad8c1 100644
--- a/config/ompi_setup_java.m4
+++ b/config/ompi_setup_java.m4
@@ -67,6 +67,11 @@ AC_DEFUN([OMPI_SETUP_JAVA_BINDINGS],[
                AC_MSG_WARN([Please reconfigure the --with-jdk options to where Java])
                AC_MSG_WARN([support can be found])
                AC_MSG_ERROR([Cannot continue])])
+
+        # Mac Java requires this file (i.e., some other Java-related
+        # header file needs this file, so we need to check for
+        # it/include it in our sources when compiling on Mac).
+        AC_CHECK_HEADERS([TargetConditionals.h])
     else
         AC_MSG_RESULT([no])
         WANT_MPI_JAVA_SUPPORT=0
diff --git a/configure.ac b/configure.ac
index 6b780c34f8..4b3e581af9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -612,8 +612,7 @@ AC_CHECK_HEADERS([alloca.h aio.h arpa/inet.h dirent.h \
     sys/types.h sys/uio.h net/uio.h sys/utsname.h sys/vfs.h sys/wait.h syslog.h \
     time.h termios.h ulimit.h unistd.h util.h utmp.h malloc.h \
     ifaddrs.h crt_externs.h regex.h signal.h \
-    ioLib.h sockLib.h hostLib.h shlwapi.h sys/synch.h limits.h db.h ndbm.h \
-    TargetConditionals.h])
+    ioLib.h sockLib.h hostLib.h shlwapi.h sys/synch.h limits.h db.h ndbm.h])
 
 AC_CHECK_HEADERS([sys/mount.h], [], [],
 [AC_INCLUDES_DEFAULT