  # ------------------------------------------------------------------------
  # gapplication(1) tool
  bin_PROGRAMS += gapplication
-@@ -891,7 +872,6 @@ gapplication_LDADD = libgio-2.0.la 			\
+@@ -889,7 +877,6 @@ gapplication_LDADD = libgio-2.0.la 			\
  	$(top_builddir)/glib/libglib-2.0.la		\
  	$(NULL)
  endif

 #ifdef G_OS_UNIX
       g_type_ensure (_g_unix_volume_monitor_get_type ());
diff --git a/gio/glocalfileinfo.c b/gio/glocalfileinfo.c
index 113a20bc1..595d73654 100644
--- a/gio/glocalfileinfo.c
+++ b/gio/glocalfileinfo.c
@@ -1259,7 +1259,7 @@ get_content_type (const char          *basename,

 #include <glib/gstdio.h>
 
-#if defined(G_OS_UNIX) && !defined(HAVE_COCOA)
+#if defined(G_OS_UNIX)
 #include "gdesktopappinfo.h"
 #endif
-#ifdef HAVE_COCOA
