  
  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 @@

 
 if OS_WIN32_AND_DLL_COMPILATION
 if MS_LIB_AVAILABLE
@@ -223,8 +221,6 @@ local_sources = \
 platform_libadd =
 platform_deps =
 appinfo_sources =
-appinfo_headers =
-contenttype_sources =
 
 if HAVE_INOTIFY
 SUBDIRS += inotify
@@ -251,14 +247,9 @@ SUBDIRS += fam
 endif
 
 if OS_UNIX
-if !OS_COCOA
+unix_appinfo_sources = gdesktopappinfo.c
 platform_libadd += xdgmime/libxdgmime.la
 platform_deps += xdgmime/libxdgmime.la
-
-appinfo_headers += gdesktopappinfo.h
-endif
-
-
 unix_sources = \
 	gfiledescriptorbased.c  \
 	gunixconnection.c	\
@@ -275,6 +266,7 @@ unix_sources = \
 	gunixvolumemonitor.h 	\
 	gunixinputstream.c 	\
 	gunixoutputstream.c 	\
+	gcontenttype.c 		\
 	gcontenttypeprivate.h 	\
 	gfdonotificationbackend.c \
 	ggtknotificationbackend.c \
@@ -286,6 +278,8 @@ unix_sources = \
 	$(portal_sources)	\
 	$(NULL)
 
+appinfo_sources += $(unix_appinfo_sources)
+
 if OS_COCOA
 if MAC_OS_X_9
 unix_sources += gcocoanotificationbackend.c
@@ -294,6 +288,7 @@ endif
 
 giounixincludedir=$(includedir)/gio-unix-2.0/gio
 giounixinclude_HEADERS = \
+	gdesktopappinfo.h	\
 	gfiledescriptorbased.h  \
 	gunixconnection.h	\
 	gunixcredentialsmessage.h	\
@@ -303,7 +298,6 @@ giounixinclude_HEADERS = \
 	gunixinputstream.h 	\
 	gunixoutputstream.h 	\
 	gunixsocketaddress.h	\
-	$(appinfo_headers) \
 	$(NULL)
 
 if HAVE_NETLINK
@@ -327,6 +321,7 @@ win32_actual_sources = \
 	$(gdbus_daemon_sources) \
 	gwin32registrykey.c \
 	gwin32registrykey.h \
+	gcontenttype-win32.c \
 	gwin32mount.c \
 	gwin32mount.h \
 	gwin32volumemonitor.c \
@@ -349,10 +344,10 @@ win32_more_sources_for_vcproj = \
 	win32/gwin32filemonitor.c
 
 if OS_WIN32
-appinfo_sources += gwin32appinfo.c gwin32appinfo.h
-contenttype_sources += gcontenttype-win32.c
+win32_appinfo_sources = gwin32appinfo.c gwin32appinfo.h
 platform_libadd += -lshlwapi -lws2_32 -ldnsapi -liphlpapi
 win32_sources = $(win32_actual_sources)
+appinfo_sources += $(win32_appinfo_sources)
 
 giowin32includedir=$(includedir)/gio-win32-2.0/gio
 giowin32include_HEADERS = \
@@ -393,18 +388,6 @@ portal_sources = \
 	$(xdp_dbus_built_sources)	\
 	$(NULL)
 

-appinfo_sources += gosxappinfo.c gosxappinfo.h
-endif
-
 if OS_UNIX
-if !OS_COCOA
 contenttype_sources += gcontenttype.c
 appinfo_sources += gdesktopappinfo.c
 endif
-endif
 
 gio_base_sources =		\
 	gappinfo.c 		\
@@ -878,7 +867,6 @@ gdbus_LDADD = libgio-2.0.la 				\
 	$(NULL)
 
 if OS_UNIX
