  
  completiondir = $(datadir)/bash-completion/completions
  completion_DATA = \
-diff --git a/gio/gcontenttype.c b/gio/gcontenttype.c
-index 339fc4e9d..d5c2b5a00 100644
---- a/gio/gcontenttype.c
-+++ b/gio/gcontenttype.c
-@@ -46,8 +46,6 @@
-  * On Win32 it is an extension string like ".doc", ".txt" or a perceived
-  * string like "audio". Such strings can be looked up in the registry at
-  * HKEY_CLASSES_ROOT.
-- * On OSX it is a [Uniform Type Identifier](https://en.wikipedia.org/wiki/Uniform_Type_Identifier)
-- * such as "com.apple.application".
-  **/
- 
- #include <dirent.h>
-@@ -189,8 +187,7 @@ g_content_type_is_mime_type (const gchar *type,
-  *
-  * Checks if the content type is the generic "unknown" type.
-  * On UNIX this is the "application/octet-stream" mimetype,
-- * while on win32 it is "*" and on OSX it is a dynamic type
-- * or octet-stream.
-+ * while on win32 it is "*".
-  *
-  * Returns: %TRUE if the type is the unknown type.
-  */
 diff --git a/gio/giomodule.c b/gio/giomodule.c
-index 7b9662dca..3a131e129 100644
+index 7b9662d..9c584c6 100644
 --- a/gio/giomodule.c
 +++ b/gio/giomodule.c
 @@ -43,12 +43,9 @@

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

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