diff --git a/src/Makefile.am b/src/Makefile.am
index de41e13f7a7c72cef970aff5938e7518a09847b5..3ebc47945f5f4f96bd132b2851147253a80f7612 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -36,51 +36,55 @@ pkginclude_HEADERS = \
 	$(NULL)
 
 pluginsinclude_HEADERS = \
+	../include/vlc_access.h \
+	../include/vlc_acl.h \
 	../include/vlc_arrays.h \
+	../include/vlc_bits.h \
+	../include/vlc_block.h \
+	../include/vlc_block_helper.h \
+	../include/vlc_charset.h \
+	../include/vlc_codec.h \
 	../include/vlc_common.h \
 	../include/vlc_config.h \
+	../include/vlc_config_cat.h \
 	../include/vlc_configuration.h \
+	../include/vlc_epg.h \
+	../include/vlc_es_out.h \
+	../include/vlc_events.h \
+	../include/vlc_gcrypt.h \
+	../include/vlc_httpd.h \
 	../include/vlc_main.h \
+	../include/vlc_md5.h \
 	../include/vlc_messages.h \
+	../include/vlc_meta.h \
 	../include/vlc_modules.h \
 	../include/vlc_mtime.h \
 	../include/vlc_objects.h \
 	../include/vlc_plugin.h \
+	../include/vlc_stream.h \
+	../include/vlc_strings.h \
 	../include/vlc_threads.h \
 	../include/vlc_variables.h \
+	../include/vlc_url.h \
+	../include/vlc_xml.h \
 	$(NULL)
 
 noinst_HEADERS = \
 	../include/iso_lang.h \
 	../include/mmx.h \
-	../include/vlc_access.h \
-	../include/vlc_acl.h \
 	../include/vlc_aout.h \
-	../include/vlc_bits.h \
-	../include/vlc_block.h \
-	../include/vlc_block_helper.h \
-	../include/vlc_charset.h \
-	../include/vlc_codec.h \
 	../include/vlc_codec_synchro.h \
 	../include/vlc_codecs.h \
-	../include/vlc_config_cat.h \
 	../include/vlc_demux.h \
 	../include/vlc_devices.h \
-	../include/vlc_epg.h \
 	../include/vlc_es.h \
-	../include/vlc_es_out.h \
-	../include/vlc_events.h \
 	../include/vlc_filter.h \
 	../include/vlc_fixups.h \
-	../include/vlc_gcrypt.h \
-	../include/vlc_httpd.h \
 	../include/vlc_image.h \
 	../include/vlc_input.h \
 	../include/vlc_interface.h \
 	../include/vlc_intf_strings.h \
 	../include/vlc_keys.h \
-	../include/vlc_md5.h \
-	../include/vlc_meta.h \
 	../include/vlc_network.h \
 	../include/vlc_osd.h \
 	../include/vlc_pgpkey.h \
@@ -88,16 +92,12 @@ noinst_HEADERS = \
 	../include/vlc_rand.h \
 	../include/vlc_services_discovery.h \
 	../include/vlc_sout.h \
-	../include/vlc_stream.h \
 	../include/vlc_streaming.h \
-	../include/vlc_strings.h \
 	../include/vlc_tls.h \
 	../include/vlc_update.h \
-	../include/vlc_url.h \
 	../include/vlc_vlm.h \
 	../include/vlc_vod.h \
 	../include/vlc_vout.h \
-	../include/vlc_xml.h \
 	$(NULL)
 
 modules/builtin.h: modules/builtin.h.in ../vlc-config Makefile.am