135 files changed, 223 insertions, 223 deletions

diff --git a/Makefile.am b/Makefile.am
index 95cb52cdda..11b4c8477d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -328,58 +328,58 @@ EXTRA_DIST += test/sys.tar.xz
 # ------------------------------------------------------------------------------
 # ata_id - ATA identify
 # ------------------------------------------------------------------------------
-src_extras_ata_id_ata_id_SOURCES = src/extras/ata_id/ata_id.c
-src_extras_ata_id_ata_id_LDADD = src/libudev-private.la
-pkglibexec_PROGRAMS += src/extras/ata_id/ata_id
+src_ata_id_ata_id_SOURCES = src/ata_id/ata_id.c
+src_ata_id_ata_id_LDADD = src/libudev-private.la
+pkglibexec_PROGRAMS += src/ata_id/ata_id
 
 # ------------------------------------------------------------------------------
 # cdrom_id - optical drive/media capability
 # ------------------------------------------------------------------------------
-src_extras_cdrom_id_cdrom_id_SOURCES = src/extras/cdrom_id/cdrom_id.c
-src_extras_cdrom_id_cdrom_id_LDADD = src/libudev-private.la
-pkglibexec_PROGRAMS += src/extras/cdrom_id/cdrom_id
-dist_udevrules_DATA += src/extras/cdrom_id/60-cdrom_id.rules
+src_cdrom_id_cdrom_id_SOURCES = src/cdrom_id/cdrom_id.c
+src_cdrom_id_cdrom_id_LDADD = src/libudev-private.la
+pkglibexec_PROGRAMS += src/cdrom_id/cdrom_id
+dist_udevrules_DATA += src/cdrom_id/60-cdrom_id.rules
 
 # ------------------------------------------------------------------------------
 # collect - trigger action when a collection of devices appeared
 # ------------------------------------------------------------------------------
-src_extras_collect_collect_SOURCES = src/extras/collect/collect.c
-src_extras_collect_collect_LDADD = src/libudev-private.la
-pkglibexec_PROGRAMS += src/extras/collect/collect
+src_collect_collect_SOURCES = src/collect/collect.c
+src_collect_collect_LDADD = src/libudev-private.la
+pkglibexec_PROGRAMS += src/collect/collect
 
 # ------------------------------------------------------------------------------
 # scsi_id - SCSI inquiry to get various serial numbers
 # ------------------------------------------------------------------------------
-src_extras_scsi_id_scsi_id_SOURCES =\
-	src/extras/scsi_id/scsi_id.c \
-	src/extras/scsi_id/scsi_serial.c \
-	src/extras/scsi_id/scsi.h \
-	src/extras/scsi_id/scsi_id.h
-src_extras_scsi_id_scsi_id_LDADD = src/libudev-private.la
-pkglibexec_PROGRAMS += src/extras/scsi_id/scsi_id
-dist_man_MANS += src/extras/scsi_id/scsi_id.8
-EXTRA_DIST += src/extras/scsi_id/README
+src_scsi_id_scsi_id_SOURCES =\
+	src/scsi_id/scsi_id.c \
+	src/scsi_id/scsi_serial.c \
+	src/scsi_id/scsi.h \
+	src/scsi_id/scsi_id.h
+src_scsi_id_scsi_id_LDADD = src/libudev-private.la
+pkglibexec_PROGRAMS += src/scsi_id/scsi_id
+dist_man_MANS += src/scsi_id/scsi_id.8
+EXTRA_DIST += src/scsi_id/README
 
 # ------------------------------------------------------------------------------
 # v4l_id - video4linux capabilities
 # ------------------------------------------------------------------------------
-src_extras_v4l_id_v4l_id_SOURCES = src/extras/v4l_id/v4l_id.c
-src_extras_v4l_id_v4l_id_LDADD = src/libudev-private.la
-pkglibexec_PROGRAMS += src/extras/v4l_id/v4l_id
-dist_udevrules_DATA += src/extras/v4l_id/60-persistent-v4l.rules
+src_v4l_id_v4l_id_SOURCES = src/v4l_id/v4l_id.c
+src_v4l_id_v4l_id_LDADD = src/libudev-private.la
+pkglibexec_PROGRAMS += src/v4l_id/v4l_id
+dist_udevrules_DATA += src/v4l_id/60-persistent-v4l.rules
 
 # ------------------------------------------------------------------------------
 # accelerometer - updates device orientation
 # ------------------------------------------------------------------------------
-src_extras_accelerometer_accelerometer_SOURCES = src/extras/accelerometer/accelerometer.c
-src_extras_accelerometer_accelerometer_LDADD = src/libudev-private.la -lm
-pkglibexec_PROGRAMS += src/extras/accelerometer/accelerometer
-dist_udevrules_DATA += src/extras/accelerometer/61-accelerometer.rules
+src_accelerometer_accelerometer_SOURCES = src/accelerometer/accelerometer.c
+src_accelerometer_accelerometer_LDADD = src/libudev-private.la -lm
+pkglibexec_PROGRAMS += src/accelerometer/accelerometer
+dist_udevrules_DATA += src/accelerometer/61-accelerometer.rules
 
 # ------------------------------------------------------------------------------
 # qemu -- qemu/kvm guest tweaks
 # ------------------------------------------------------------------------------
-dist_udevrules_DATA += src/extras/qemu/42-qemu-usb.rules
+dist_udevrules_DATA += src/qemu/42-qemu-usb.rules
 
 if ENABLE_GUDEV
 # ------------------------------------------------------------------------------
@@ -389,91 +389,91 @@ LIBGUDEV_CURRENT=1
 LIBGUDEV_REVISION=1
 LIBGUDEV_AGE=1
 
-SUBDIRS += src/extras/gudev/docs
-
-src_extras_gudev_libgudev_includedir=$(includedir)/gudev-1.0/gudev
-src_extras_gudev_libgudev_include_HEADERS = \
-	src/extras/gudev/gudev.h \
-	src/extras/gudev/gudevenums.h \
-	src/extras/gudev/gudevenumtypes.h \
-	src/extras/gudev/gudevtypes.h \
-	src/extras/gudev/gudevclient.h \
-	src/extras/gudev/gudevdevice.h \
-	src/extras/gudev/gudevenumerator.h
-
-lib_LTLIBRARIES += src/extras/gudev/libgudev-1.0.la
-
-pkgconfig_DATA += src/extras/gudev/gudev-1.0.pc
-EXTRA_DIST += src/extras/gudev/gudev-1.0.pc.in
-CLEANFILES += src/extras/gudev/gudev-1.0.pc
-
-src_extras_gudev_libgudev_1_0_la_SOURCES = \
-	src/extras/gudev/gudevenums.h \
-	src/extras/gudev/gudevenumtypes.h \
-	src/extras/gudev/gudevenumtypes.h\
-	src/extras/gudev/gudevtypes.h \
-	src/extras/gudev/gudevclient.h \
-	src/extras/gudev/gudevclient.c \
-	src/extras/gudev/gudevdevice.h \
-	src/extras/gudev/gudevdevice.c \
-	src/extras/gudev/gudevenumerator.h \
-	src/extras/gudev/gudevenumerator.c \
-	src/extras/gudev/gudevprivate.h
-
-nodist_src_extras_gudev_libgudev_1_0_la_SOURCES = \
-	src/extras/gudev/gudevmarshal.h \
-	src/extras/gudev/gudevmarshal.c \
-	src/extras/gudev/gudevenumtypes.h \
-	src/extras/gudev/gudevenumtypes.c
-BUILT_SOURCES += $(nodist_src_extras_gudev_libgudev_1_0_la_SOURCES)
-
-src_extras_gudev_libgudev_1_0_la_CPPFLAGS = \
+SUBDIRS += src/gudev/docs
+
+src_gudev_libgudev_includedir=$(includedir)/gudev-1.0/gudev
+src_gudev_libgudev_include_HEADERS = \
+	src/gudev/gudev.h \
+	src/gudev/gudevenums.h \
+	src/gudev/gudevenumtypes.h \
+	src/gudev/gudevtypes.h \
+	src/gudev/gudevclient.h \
+	src/gudev/gudevdevice.h \
+	src/gudev/gudevenumerator.h
+
+lib_LTLIBRARIES += src/gudev/libgudev-1.0.la
+
+pkgconfig_DATA += src/gudev/gudev-1.0.pc
+EXTRA_DIST += src/gudev/gudev-1.0.pc.in
+CLEANFILES += src/gudev/gudev-1.0.pc
+
+src_gudev_libgudev_1_0_la_SOURCES = \
+	src/gudev/gudevenums.h \
+	src/gudev/gudevenumtypes.h \
+	src/gudev/gudevenumtypes.h\
+	src/gudev/gudevtypes.h \
+	src/gudev/gudevclient.h \
+	src/gudev/gudevclient.c \
+	src/gudev/gudevdevice.h \
+	src/gudev/gudevdevice.c \
+	src/gudev/gudevenumerator.h \
+	src/gudev/gudevenumerator.c \
+	src/gudev/gudevprivate.h
+
+nodist_src_gudev_libgudev_1_0_la_SOURCES = \
+	src/gudev/gudevmarshal.h \
+	src/gudev/gudevmarshal.c \
+	src/gudev/gudevenumtypes.h \
+	src/gudev/gudevenumtypes.c
+BUILT_SOURCES += $(nodist_src_gudev_libgudev_1_0_la_SOURCES)
+
+src_gudev_libgudev_1_0_la_CPPFLAGS = \
 	$(AM_CPPFLAGS) \
-	-I$(top_builddir)/src/extras \
-	-I$(top_srcdir)/src/extras \
-	-I$(top_builddir)/src/extras/gudev \
-	-I$(top_srcdir)/src/extras/gudev \
+	-I$(top_builddir)/src\
+	-I$(top_srcdir)/src\
+	-I$(top_builddir)/src/gudev \
+	-I$(top_srcdir)/src/gudev \
 	-D_POSIX_PTHREAD_SEMANTICS -D_REENTRANT \
 	-D_GUDEV_COMPILATION \
 	-DG_LOG_DOMAIN=\"GUdev\"
 
-src_extras_gudev_libgudev_1_0_la_CFLAGS = \
+src_gudev_libgudev_1_0_la_CFLAGS = \
 	-fvisibility=default \
 	$(GLIB_CFLAGS)
 
-src_extras_gudev_libgudev_1_0_la_LIBADD = src/libudev.la $(GLIB_LIBS)
+src_gudev_libgudev_1_0_la_LIBADD = src/libudev.la $(GLIB_LIBS)
 
-src_extras_gudev_libgudev_1_0_la_LDFLAGS = \
+src_gudev_libgudev_1_0_la_LDFLAGS = \
 	-version-info $(LIBGUDEV_CURRENT):$(LIBGUDEV_REVISION):$(LIBGUDEV_AGE) \
 	-export-dynamic -no-undefined \
 	-export-symbols-regex '^g_udev_.*'
 
 EXTRA_DIST += \
-	src/extras/gudev/COPYING \
-	src/extras/gudev/gudevmarshal.list \
-	src/extras/gudev/gudevenumtypes.h.template \
-	src/extras/gudev/gudevenumtypes.c.template \
-	src/extras/gudev/gjs-example.js \
-	src/extras/gudev/seed-example-enum.js \
-	src/extras/gudev/seed-example.js
-
-src/extras/gudev/gudevmarshal.h: src/extras/gudev/gudevmarshal.list
+	src/gudev/COPYING \
+	src/gudev/gudevmarshal.list \
+	src/gudev/gudevenumtypes.h.template \
+	src/gudev/gudevenumtypes.c.template \
+	src/gudev/gjs-example.js \
+	src/gudev/seed-example-enum.js \
+	src/gudev/seed-example.js
+
+src/gudev/gudevmarshal.h: src/gudev/gudevmarshal.list
 	$(AM_V_GEN)glib-genmarshal $< --prefix=g_udev_marshal --header > $@
 
-src/extras/gudev/gudevmarshal.c: src/extras/gudev/gudevmarshal.list
+src/gudev/gudevmarshal.c: src/gudev/gudevmarshal.list
 	$(AM_V_GEN)echo "#include \"gudevmarshal.h\"" > $@ && \
 	glib-genmarshal $< --prefix=g_udev_marshal --body >> $@
 
-src/extras/gudev/gudevenumtypes.h: src/extras/gudev/gudevenumtypes.h.template src/extras/gudev/gudevenums.h
+src/gudev/gudevenumtypes.h: src/gudev/gudevenumtypes.h.template src/gudev/gudevenums.h
 	$(AM_V_GEN)glib-mkenums --template $^ > \
 	    $@.tmp && mv $@.tmp $@
 
-src/extras/gudev/gudevenumtypes.c: src/extras/gudev/gudevenumtypes.c.template src/extras/gudev/gudevenums.h
+src/gudev/gudevenumtypes.c: src/gudev/gudevenumtypes.c.template src/gudev/gudevenums.h
 	$(AM_V_GEN)glib-mkenums --template $^ > \
 	    $@.tmp && mv $@.tmp $@
 
 if ENABLE_INTROSPECTION
-src/extras/gudev/GUdev-1.0.gir: src/extras/gudev/libgudev-1.0.la $(G_IR_SCANNER)
+src/gudev/GUdev-1.0.gir: src/gudev/libgudev-1.0.la $(G_IR_SCANNER)
 	$(AM_V_GEN)$(G_IR_SCANNER) -v \
 		--warn-all \
 		--namespace GUdev \
@@ -481,35 +481,35 @@ src/extras/gudev/GUdev-1.0.gir: src/extras/gudev/libgudev-1.0.la $(G_IR_SCANNER)
 		--include=GObject-2.0 \
 		--library=gudev-1.0 \
 		--library-path=$(top_builddir)/src \
-		--library-path=$(top_builddir)/src/extras/gudev \
+		--library-path=$(top_builddir)/src/gudev \
 		--output $@ \
 		--pkg=glib-2.0 \
 		--pkg=gobject-2.0 \
 		--pkg-export=gudev-1.0 \
 		--c-include=gudev/gudev.h \
-		-I$(top_srcdir)/src/extras \
-		-I$(top_builddir)/src/extras \
+		-I$(top_srcdir)/src/\
+		-I$(top_builddir)/src/\
 		-D_GUDEV_COMPILATION \
 		-D_GUDEV_WORK_AROUND_DEV_T_BUG \
-		$(top_srcdir)/src/extras/gudev/gudev.h \
-		$(top_srcdir)/src/extras/gudev/gudevtypes.h \
-		$(top_srcdir)/src/extras/gudev/gudevenums.h \
-		$(or $(wildcard $(top_builddir)/src/extras/gudev/gudevenumtypes.h),$(top_srcdir)/src/extras/gudev/gudevenumtypes.h) \
-		$(top_srcdir)/src/extras/gudev/gudevclient.h \
-		$(top_srcdir)/src/extras/gudev/gudevdevice.h \
-		$(top_srcdir)/src/extras/gudev/gudevenumerator.h \
-		$(top_srcdir)/src/extras/gudev/gudevclient.c \
-		$(top_srcdir)/src/extras/gudev/gudevdevice.c \
-		$(top_srcdir)/src/extras/gudev/gudevenumerator.c
-
-src/extras/gudev/GUdev-1.0.typelib: src/extras/gudev/GUdev-1.0.gir $(G_IR_COMPILER)
+		$(top_srcdir)/src/gudev/gudev.h \
+		$(top_srcdir)/src/gudev/gudevtypes.h \
+		$(top_srcdir)/src/gudev/gudevenums.h \
+		$(or $(wildcard $(top_builddir)/src/gudev/gudevenumtypes.h),$(top_srcdir)/src/gudev/gudevenumtypes.h) \
+		$(top_srcdir)/src/gudev/gudevclient.h \
+		$(top_srcdir)/src/gudev/gudevdevice.h \
+		$(top_srcdir)/src/gudev/gudevenumerator.h \
+		$(top_srcdir)/src/gudev/gudevclient.c \
+		$(top_srcdir)/src/gudev/gudevdevice.c \
+		$(top_srcdir)/src/gudev/gudevenumerator.c
+
+src/gudev/GUdev-1.0.typelib: src/gudev/GUdev-1.0.gir $(G_IR_COMPILER)
 	$(AM_V_GEN)g-ir-compiler $< -o $@
 
 girdir = $(GIRDIR)
-gir_DATA = src/extras/gudev/GUdev-1.0.gir
+gir_DATA = src/gudev/GUdev-1.0.gir
 
 typelibsdir = $(GIRTYPELIBDIR)
-typelibs_DATA = src/extras/gudev/GUdev-1.0.typelib
+typelibs_DATA = src/gudev/GUdev-1.0.typelib
 
 CLEANFILES += $(gir_DATA) $(typelibs_DATA)
 endif # ENABLE_INTROSPECTION
@@ -535,114 +535,114 @@ if ENABLE_KEYMAP
 # ------------------------------------------------------------------------------
 # keymap - map custom hardware's multimedia keys
 # ------------------------------------------------------------------------------
-src_extras_keymap_keymap_SOURCES = src/extras/keymap/keymap.c
-src_extras_keymap_keymap_CPPFLAGS = $(AM_CPPFLAGS) -I src/extras/keymap
-nodist_src_extras_keymap_keymap_SOURCES = \
-	src/extras/keymap/keys-from-name.h \
-	src/extras/keymap/keys-to-name.h
-BUILT_SOURCES += $(nodist_src_extras_keymap_keymap_SOURCES)
+src_keymap_keymap_SOURCES = src/keymap/keymap.c
+src_keymap_keymap_CPPFLAGS = $(AM_CPPFLAGS) -I src/keymap
+nodist_src_keymap_keymap_SOURCES = \
+	src/keymap/keys-from-name.h \
+	src/keymap/keys-to-name.h
+BUILT_SOURCES += $(nodist_src_keymap_keymap_SOURCES)
 
-pkglibexec_PROGRAMS += src/extras/keymap/keymap
-dist_doc_DATA = src/extras/keymap/README.keymap.txt
+pkglibexec_PROGRAMS += src/keymap/keymap
+dist_doc_DATA = src/keymap/README.keymap.txt
 
 dist_udevrules_DATA += \
-	src/extras/keymap/95-keymap.rules \
-	src/extras/keymap/95-keyboard-force-release.rules
+	src/keymap/95-keymap.rules \
+	src/keymap/95-keyboard-force-release.rules
 
-dist_udevhome_SCRIPTS += src/extras/keymap/findkeyboards
-udevhome_SCRIPTS += src/extras/keymap/keyboard-force-release.sh
+dist_udevhome_SCRIPTS += src/keymap/findkeyboards
+udevhome_SCRIPTS += src/keymap/keyboard-force-release.sh
 
 EXTRA_DIST += \
-	src/extras/keymap/check-keymaps.sh \
-	src/extras/keymap/keyboard-force-release.sh.in
+	src/keymap/check-keymaps.sh \
+	src/keymap/keyboard-force-release.sh.in
 
 CLEANFILES += \
-	src/extras/keymap/keys.txt \
-	src/extras/keymap/keys-from-name.gperf \
-	src/extras/keymap/keyboard-force-release.sh
+	src/keymap/keys.txt \
+	src/keymap/keys-from-name.gperf \
+	src/keymap/keyboard-force-release.sh
 
 udevkeymapdir = $(libexecdir)/udev/keymaps
 dist_udevkeymap_DATA = \
-	src/extras/keymap/keymaps/acer \
-	src/extras/keymap/keymaps/acer-aspire_5720 \
-	src/extras/keymap/keymaps/acer-aspire_8930 \
-	src/extras/keymap/keymaps/acer-aspire_5920g \
-	src/extras/keymap/keymaps/acer-aspire_6920 \
-	src/extras/keymap/keymaps/acer-travelmate_c300 \
-	src/extras/keymap/keymaps/asus \
-	src/extras/keymap/keymaps/compaq-e_evo \
-	src/extras/keymap/keymaps/dell \
-	src/extras/keymap/keymaps/dell-latitude-xt2 \
-	src/extras/keymap/keymaps/everex-xt5000 \
-	src/extras/keymap/keymaps/fujitsu-amilo_li_2732 \
-	src/extras/keymap/keymaps/fujitsu-amilo_pa_2548 \
-	src/extras/keymap/keymaps/fujitsu-amilo_pro_edition_v3505 \
-	src/extras/keymap/keymaps/fujitsu-amilo_pro_v3205 \
-	src/extras/keymap/keymaps/fujitsu-amilo_si_1520 \
-	src/extras/keymap/keymaps/fujitsu-esprimo_mobile_v5 \
-	src/extras/keymap/keymaps/fujitsu-esprimo_mobile_v6 \
-	src/extras/keymap/keymaps/genius-slimstar-320 \
-	src/extras/keymap/keymaps/hewlett-packard \
-	src/extras/keymap/keymaps/hewlett-packard-2510p_2530p \
-	src/extras/keymap/keymaps/hewlett-packard-compaq_elitebook \
-	src/extras/keymap/keymaps/hewlett-packard-pavilion \
-	src/extras/keymap/keymaps/hewlett-packard-presario-2100 \
-	src/extras/keymap/keymaps/hewlett-packard-tablet \
-	src/extras/keymap/keymaps/hewlett-packard-tx2 \
-	src/extras/keymap/keymaps/ibm-thinkpad-usb-keyboard-trackpoint \
-	src/extras/keymap/keymaps/inventec-symphony_6.0_7.0 \
-	src/extras/keymap/keymaps/lenovo-3000 \
-	src/extras/keymap/keymaps/lenovo-ideapad \
-	src/extras/keymap/keymaps/lenovo-thinkpad-usb-keyboard-trackpoint \
-	src/extras/keymap/keymaps/lenovo-thinkpad_x6_tablet \
-	src/extras/keymap/keymaps/lenovo-thinkpad_x200_tablet \
-	src/extras/keymap/keymaps/lg-x110 \
-	src/extras/keymap/keymaps/logitech-wave \
-	src/extras/keymap/keymaps/logitech-wave-cordless \
-	src/extras/keymap/keymaps/logitech-wave-pro-cordless \
-	src/extras/keymap/keymaps/maxdata-pro_7000 \
-	src/extras/keymap/keymaps/medion-fid2060 \
-	src/extras/keymap/keymaps/medionnb-a555 \
-	src/extras/keymap/keymaps/micro-star \
-	src/extras/keymap/keymaps/module-asus-w3j \
-	src/extras/keymap/keymaps/module-ibm \
-	src/extras/keymap/keymaps/module-lenovo \
-	src/extras/keymap/keymaps/module-sony \
-	src/extras/keymap/keymaps/module-sony-old \
-	src/extras/keymap/keymaps/module-sony-vgn \
-	src/extras/keymap/keymaps/olpc-xo \
-	src/extras/keymap/keymaps/onkyo \
-	src/extras/keymap/keymaps/oqo-model2 \
-	src/extras/keymap/keymaps/samsung-other \
-	src/extras/keymap/keymaps/samsung-sq1us \
-	src/extras/keymap/keymaps/samsung-sx20s \
-	src/extras/keymap/keymaps/toshiba-satellite_a100 \
-	src/extras/keymap/keymaps/toshiba-satellite_a110 \
-	src/extras/keymap/keymaps/toshiba-satellite_m30x \
-	src/extras/keymap/keymaps/zepto-znote
+	src/keymap/keymaps/acer \
+	src/keymap/keymaps/acer-aspire_5720 \
+	src/keymap/keymaps/acer-aspire_8930 \
+	src/keymap/keymaps/acer-aspire_5920g \
+	src/keymap/keymaps/acer-aspire_6920 \
+	src/keymap/keymaps/acer-travelmate_c300 \
+	src/keymap/keymaps/asus \
+	src/keymap/keymaps/compaq-e_evo \
+	src/keymap/keymaps/dell \
+	src/keymap/keymaps/dell-latitude-xt2 \
+	src/keymap/keymaps/everex-xt5000 \
+	src/keymap/keymaps/fujitsu-amilo_li_2732 \
+	src/keymap/keymaps/fujitsu-amilo_pa_2548 \
+	src/keymap/keymaps/fujitsu-amilo_pro_edition_v3505 \
+	src/keymap/keymaps/fujitsu-amilo_pro_v3205 \
+	src/keymap/keymaps/fujitsu-amilo_si_1520 \
+	src/keymap/keymaps/fujitsu-esprimo_mobile_v5 \
+	src/keymap/keymaps/fujitsu-esprimo_mobile_v6 \
+	src/keymap/keymaps/genius-slimstar-320 \
+	src/keymap/keymaps/hewlett-packard \
+	src/keymap/keymaps/hewlett-packard-2510p_2530p \
+	src/keymap/keymaps/hewlett-packard-compaq_elitebook \
+	src/keymap/keymaps/hewlett-packard-pavilion \
+	src/keymap/keymaps/hewlett-packard-presario-2100 \
+	src/keymap/keymaps/hewlett-packard-tablet \
+	src/keymap/keymaps/hewlett-packard-tx2 \
+	src/keymap/keymaps/ibm-thinkpad-usb-keyboard-trackpoint \
+	src/keymap/keymaps/inventec-symphony_6.0_7.0 \
+	src/keymap/keymaps/lenovo-3000 \
+	src/keymap/keymaps/lenovo-ideapad \
+	src/keymap/keymaps/lenovo-thinkpad-usb-keyboard-trackpoint \
+	src/keymap/keymaps/lenovo-thinkpad_x6_tablet \
+	src/keymap/keymaps/lenovo-thinkpad_x200_tablet \
+	src/keymap/keymaps/lg-x110 \
+	src/keymap/keymaps/logitech-wave \
+	src/keymap/keymaps/logitech-wave-cordless \
+	src/keymap/keymaps/logitech-wave-pro-cordless \
+	src/keymap/keymaps/maxdata-pro_7000 \
+	src/keymap/keymaps/medion-fid2060 \
+	src/keymap/keymaps/medionnb-a555 \
+	src/keymap/keymaps/micro-star \
+	src/keymap/keymaps/module-asus-w3j \
+	src/keymap/keymaps/module-ibm \
+	src/keymap/keymaps/module-lenovo \
+	src/keymap/keymaps/module-sony \
+	src/keymap/keymaps/module-sony-old \
+	src/keymap/keymaps/module-sony-vgn \
+	src/keymap/keymaps/olpc-xo \
+	src/keymap/keymaps/onkyo \
+	src/keymap/keymaps/oqo-model2 \
+	src/keymap/keymaps/samsung-other \
+	src/keymap/keymaps/samsung-sq1us \
+	src/keymap/keymaps/samsung-sx20s \
+	src/keymap/keymaps/toshiba-satellite_a100 \
+	src/keymap/keymaps/toshiba-satellite_a110 \
+	src/keymap/keymaps/toshiba-satellite_m30x \
+	src/keymap/keymaps/zepto-znote
 
 udevkeymapforcereldir = $(libexecdir)/udev/keymaps/force-release
 dist_udevkeymapforcerel_DATA = \
-	src/extras/keymap/force-release-maps/dell-touchpad \
-	src/extras/keymap/force-release-maps/hp-other \
-	src/extras/keymap/force-release-maps/samsung-other \
-	src/extras/keymap/force-release-maps/common-volume-keys
+	src/keymap/force-release-maps/dell-touchpad \
+	src/keymap/force-release-maps/hp-other \
+	src/keymap/force-release-maps/samsung-other \
+	src/keymap/force-release-maps/common-volume-keys
 
-src/extras/keymap/keys.txt: $(INCLUDE_PREFIX)/linux/input.h
-	$(AM_V_at)mkdir -p src/extras/keymap
+src/keymap/keys.txt: $(INCLUDE_PREFIX)/linux/input.h
+	$(AM_V_at)mkdir -p src/keymap
 	$(AM_V_GEN)$(AWK) '/^#define.*KEY_[^ ]+[ \t]+[0-9]/ { if ($$2 != "KEY_MAX") { print $$2 } }' < $< | sed 's/^KEY_COFFEE$$/KEY_SCREENLOCK/' > $@
 
-src/extras/keymap/keys-from-name.gperf: src/extras/keymap/keys.txt
+src/keymap/keys-from-name.gperf: src/keymap/keys.txt
 	$(AM_V_GEN)$(AWK) 'BEGIN{ print "struct key { const char* name; unsigned short id; };"; print "%null-strings"; print "%%";} { print $$1 ", " $$1 }' < $< > $@
 
-src/extras/keymap/keys-from-name.h: src/extras/keymap/keys-from-name.gperf Makefile
+src/keymap/keys-from-name.h: src/keymap/keys-from-name.gperf Makefile
 	$(AM_V_GEN)$(GPERF) -L ANSI-C -t --ignore-case -N lookup_key -H hash_key_name -p -C < $< > $@
 
-src/extras/keymap/keys-to-name.h: src/extras/keymap/keys.txt Makefile
+src/keymap/keys-to-name.h: src/keymap/keys.txt Makefile
 	$(AM_V_GEN)$(AWK) 'BEGIN{ print "const char* const key_names[KEY_CNT] = { "} { print "[" $$1 "] = \"" $$1 "\"," } END{print "};"}' < $< > $@
 
-keymaps-distcheck-hook: src/extras/keymap/keys.txt
-	$(top_srcdir)/src/extras/keymap/check-keymaps.sh $(top_srcdir) $^
+keymaps-distcheck-hook: src/keymap/keys.txt
+	$(top_srcdir)/src/keymap/check-keymaps.sh $(top_srcdir) $^
 DISTCHECK_HOOKS += keymaps-distcheck-hook
 endif
 
@@ -650,13 +650,13 @@ if ENABLE_MTD_PROBE
 # ------------------------------------------------------------------------------
 # mtd_probe - autoloads FTL module for mtd devices
 # ------------------------------------------------------------------------------
-src_extras_mtd_probe_mtd_probe_SOURCES =  \
-	src/extras/mtd_probe/mtd_probe.c \
-	src/extras/mtd_probe/mtd_probe.h \
-	src/extras/mtd_probe/probe_smartmedia.c
-src_extras_mtd_probe_mtd_probe_CPPFLAGS = $(AM_CPPFLAGS)
-dist_udevrules_DATA += src/extras/mtd_probe/75-probe_mtd.rules
-pkglibexec_PROGRAMS += src/extras/mtd_probe/mtd_probe
+src_mtd_probe_mtd_probe_SOURCES =  \
+	src/mtd_probe/mtd_probe.c \
+	src/mtd_probe/mtd_probe.h \
+	src/mtd_probe/probe_smartmedia.c
+src_mtd_probe_mtd_probe_CPPFLAGS = $(AM_CPPFLAGS)
+dist_udevrules_DATA += src/mtd_probe/75-probe_mtd.rules
+pkglibexec_PROGRAMS += src/mtd_probe/mtd_probe
 endif
 
 if ENABLE_RULE_GENERATOR
@@ -664,35 +664,35 @@ if ENABLE_RULE_GENERATOR
 # rule_generator - persistent network and optical device rule generator
 # ------------------------------------------------------------------------------
 dist_udevhome_SCRIPTS += \
-	src/extras/rule_generator/write_cd_rules \
-	src/extras/rule_generator/write_net_rules
+	src/rule_generator/write_cd_rules \
+	src/rule_generator/write_net_rules
 
 dist_udevhome_DATA += \
-	src/extras/rule_generator/rule_generator.functions
+	src/rule_generator/rule_generator.functions
 
 dist_udevrules_DATA += \
-	src/extras/rule_generator/75-cd-aliases-generator.rules \
-	src/extras/rule_generator/75-persistent-net-generator.rules
+	src/rule_generator/75-cd-aliases-generator.rules \
+	src/rule_generator/75-persistent-net-generator.rules
 endif
 
 if ENABLE_FLOPPY
 # ------------------------------------------------------------------------------
 # create_floppy_devices - historical floppy kernel device nodes (/dev/fd0h1440, ...)
 # ------------------------------------------------------------------------------
-src_create_floppy_devices_SOURCES = src/extras/floppy/create_floppy_devices.c
+src_create_floppy_devices_SOURCES = src/floppy/create_floppy_devices.c
 src_create_floppy_devices_LDADD = src/libudev-private.la
 pkglibexec_PROGRAMS += src/create_floppy_devices
-dist_udevrules_DATA += src/extras/floppy/60-floppy.rules
+dist_udevrules_DATA += src/floppy/60-floppy.rules
 endif
 
 if ENABLE_EDD
 # ------------------------------------------------------------------------------
 # edd_id - create /dev/disk/by-id/edd-* links for BIOS EDD data
 # ------------------------------------------------------------------------------
-src_edd_id_SOURCES = src/extras/edd_id/edd_id.c
-src_edd_id_LDADD = src/libudev-private.la
-pkglibexec_PROGRAMS += src/edd_id
-dist_udevrules_DATA += src/extras/edd_id/61-persistent-storage-edd.rules
+src__edd_id_edd_id_SOURCES = src/edd_id/edd_id.c
+src_edd_id_edd_id_LDADD = src/libudev-private.la
+pkglibexec_PROGRAMS += src/edd_id/edd_id
+dist_udevrules_DATA += src/edd_id/61-persistent-storage-edd.rules
 endif
 
 # ------------------------------------------------------------------------------
@@ -763,5 +763,5 @@ doc-sync:
 	for i in src/*.html; do echo $$i; kup put $$i $$i.sign /pub/linux/utils/kernel/hotplug/udev/; done
 	for i in src/docs/html/*.{html,css,png}; do rm -f $$i.sign; gpg --armor --detach-sign --output=$$i.sign $$i; done
 	for i in src/docs/html/*.{html,css,png}; do echo $$i; kup put $$i $$i.sign /pub/linux/utils/kernel/hotplug/libudev/; done
-	for i in src/extras/gudev/docs/html/*.{html,css,png}; do rm -f $$i.sign; gpg --armor --detach-sign --output=$$i.sign $$i; done
-	for i in src/extras/gudev/docs/html/*.{html,css,png}; do echo $$i; kup put $$i $$i.sign /pub/linux/utils/kernel/hotplug/gudev/; done
+	for i in src/gudev/docs/html/*.{html,css,png}; do rm -f $$i.sign; gpg --armor --detach-sign --output=$$i.sign $$i; done
+	for i in src/gudev/docs/html/*.{html,css,png}; do echo $$i; kup put $$i $$i.sign /pub/linux/utils/kernel/hotplug/gudev/; done
diff --git a/configure.ac b/configure.ac
index 2e750babe8..8f6e004392 100644
--- a/configure.ac
+++ b/configure.ac
@@ -205,8 +205,8 @@ AC_CONFIG_FILES([
        Makefile
        src/docs/Makefile
        src/docs/version.xml
-       src/extras/gudev/docs/Makefile
-       src/extras/gudev/docs/version.xml
+       src/gudev/docs/Makefile
+       src/gudev/docs/version.xml
 ])
 
 AC_OUTPUT
diff --git a/rules/misc/30-kernel-compat.rules b/rules/misc/30-kernel-compat.rules
index cddf371d3b..2596095506 100644
--- a/rules/misc/30-kernel-compat.rules
+++ b/rules/misc/30-kernel-compat.rules
@@ -7,7 +7,7 @@
 
 ACTION!="add", GOTO="kernel_compat_end"
 
-# see src/extras/qemu/42-qemu-usb.rules, version for 2.6.32 + older.
+# see src/qemu/42-qemu-usb.rules, version for 2.6.32 + older.
 ACTION=="add", SUBSYSTEM=="usb", ATTR{product}=="QEMU USB Mouse", ATTR{serial}=="42", TEST=="power/level", ATTR{power/level}="auto"
 ACTION=="add", SUBSYSTEM=="usb", ATTR{product}=="QEMU USB Tablet", ATTR{serial}=="42", TEST=="power/level", ATTR{power/level}="auto"
 ACTION=="add", SUBSYSTEM=="usb", ATTR{product}=="QEMU USB Keyboard", ATTR{serial}=="42", TEST=="power/level", ATTR{power/level}="auto"
diff --git a/src/extras/accelerometer/.gitignore b/src/accelerometer/.gitignore
index dddc2204d4..dddc2204d4 100644
--- a/src/extras/accelerometer/.gitignore
+++ b/src/accelerometer/.gitignore
diff --git a/src/extras/accelerometer/61-accelerometer.rules b/src/accelerometer/61-accelerometer.rules
index a6a2bfd088..a6a2bfd088 100644
--- a/src/extras/accelerometer/61-accelerometer.rules
+++ b/src/accelerometer/61-accelerometer.rules
diff --git a/src/extras/accelerometer/accelerometer.c b/src/accelerometer/accelerometer.c
index bc9715b264..bc9715b264 100644
--- a/src/extras/accelerometer/accelerometer.c
+++ b/src/accelerometer/accelerometer.c
diff --git a/src/extras/ata_id/.gitignore b/src/ata_id/.gitignore
index 77837266e6..77837266e6 100644
--- a/src/extras/ata_id/.gitignore
+++ b/src/ata_id/.gitignore
diff --git a/src/extras/ata_id/ata_id.c b/src/ata_id/ata_id.c
index 257f494496..257f494496 100644
--- a/src/extras/ata_id/ata_id.c
+++ b/src/ata_id/ata_id.c
diff --git a/src/extras/cdrom_id/.gitignore b/src/cdrom_id/.gitignore
index 7d817ea74e..7d817ea74e 100644
--- a/src/extras/cdrom_id/.gitignore
+++ b/src/cdrom_id/.gitignore
diff --git a/src/extras/cdrom_id/60-cdrom_id.rules b/src/cdrom_id/60-cdrom_id.rules
index 6eaf76a72c..6eaf76a72c 100644
--- a/src/extras/cdrom_id/60-cdrom_id.rules
+++ b/src/cdrom_id/60-cdrom_id.rules
diff --git a/src/extras/cdrom_id/cdrom_id.c b/src/cdrom_id/cdrom_id.c
index f90d52ec9c..f90d52ec9c 100644
--- a/src/extras/cdrom_id/cdrom_id.c
+++ b/src/cdrom_id/cdrom_id.c
diff --git a/src/extras/collect/.gitignore b/src/collect/.gitignore
index c30ad6527c..c30ad6527c 100644
--- a/src/extras/collect/.gitignore
+++ b/src/collect/.gitignore
diff --git a/src/extras/collect/collect.c b/src/collect/collect.c
index 076fe479e2..076fe479e2 100644
--- a/src/extras/collect/collect.c
+++ b/src/collect/collect.c
diff --git a/src/extras/edd_id/.gitignore b/src/edd_id/.gitignore
index 14fb67c634..14fb67c634 100644
--- a/src/extras/edd_id/.gitignore
+++ b/src/edd_id/.gitignore
diff --git a/src/extras/edd_id/61-persistent-storage-edd.rules b/src/edd_id/61-persistent-storage-edd.rules
index 6b4fb8ecfe..6b4fb8ecfe 100644
--- a/src/extras/edd_id/61-persistent-storage-edd.rules
+++ b/src/edd_id/61-persistent-storage-edd.rules
diff --git a/src/extras/edd_id/edd_id.c b/src/edd_id/edd_id.c
index 471ea60533..471ea60533 100644
--- a/src/extras/edd_id/edd_id.c
+++ b/src/edd_id/edd_id.c
diff --git a/src/extras/floppy/.gitignore b/src/floppy/.gitignore
index 939f625a4a..939f625a4a 100644
--- a/src/extras/floppy/.gitignore
+++ b/src/floppy/.gitignore
diff --git a/src/extras/floppy/60-floppy.rules b/src/floppy/60-floppy.rules
index 53e4a9e59a..53e4a9e59a 100644
--- a/src/extras/floppy/60-floppy.rules
+++ b/src/floppy/60-floppy.rules
diff --git a/src/extras/floppy/create_floppy_devices.c b/src/floppy/create_floppy_devices.c
index f71ef0d809..f71ef0d809 100644
--- a/src/extras/floppy/create_floppy_devices.c
+++ b/src/floppy/create_floppy_devices.c
diff --git a/src/extras/gudev/.gitignore b/src/gudev/.gitignore
index d20fa523e4..d20fa523e4 100644
--- a/src/extras/gudev/.gitignore
+++ b/src/gudev/.gitignore
diff --git a/src/extras/gudev/COPYING b/src/gudev/COPYING
index da97db2bd0..da97db2bd0 100644
--- a/src/extras/gudev/COPYING
+++ b/src/gudev/COPYING
diff --git a/src/extras/gudev/docs/.gitignore b/src/gudev/docs/.gitignore
index 8eada6d409..8eada6d409 100644
--- a/src/extras/gudev/docs/.gitignore
+++ b/src/gudev/docs/.gitignore
diff --git a/src/extras/gudev/docs/Makefile.am b/src/gudev/docs/Makefile.am
index 3512197660..2f0a8cb3eb 100644
--- a/src/extras/gudev/docs/Makefile.am
+++ b/src/gudev/docs/Makefile.am
@@ -48,8 +48,8 @@ FIXXREF_OPTIONS=
 # Used for dependencies. The docs will be rebuilt if any of these change.
 # e.g. HFILE_GLOB=$(top_srcdir)/gtk/*.h
 # e.g. CFILE_GLOB=$(top_srcdir)/gtk/*.c
-HFILE_GLOB=$(top_srcdir)/src/extras/gudev/*.h
-CFILE_GLOB=$(top_srcdir)/src/extras/gudev/*.c
+HFILE_GLOB=$(top_srcdir)/src/gudev/*.h
+CFILE_GLOB=$(top_srcdir)/src/gudev/*.c
 
 # Extra header to include when scanning, which are not under DOC_SOURCE_DIR
 # e.g. EXTRA_HFILES=$(top_srcdir}/contrib/extra.h
@@ -80,12 +80,12 @@ expand_content_files=
 GTKDOC_CFLAGS = \
         $(DBUS_GLIB_CFLAGS) \
         $(GLIB_CFLAGS) \
-        -I$(top_srcdir)/src/extras/gudev \
-        -I$(top_builddir)/src/extras/gudev
+        -I$(top_srcdir)/src/gudev \
+        -I$(top_builddir)/src/gudev
 
 GTKDOC_LIBS = \
         $(GLIB_LIBS) \
-        $(top_builddir)/src/extras/gudev/libgudev-1.0.la
+        $(top_builddir)/src/gudev/libgudev-1.0.la
 
 # This includes the standard gtk-doc make rules, copied by gtkdocize.
 include $(top_srcdir)/gtk-doc.make
diff --git a/src/extras/gudev/docs/gudev-docs.xml b/src/gudev/docs/gudev-docs.xml
index f876c3bc05..f876c3bc05 100644
--- a/src/extras/gudev/docs/gudev-docs.xml
+++ b/src/gudev/docs/gudev-docs.xml
diff --git a/src/extras/gudev/docs/gudev-sections.txt b/src/gudev/docs/gudev-sections.txt
index 213e1a7465..213e1a7465 100644
--- a/src/extras/gudev/docs/gudev-sections.txt
+++ b/src/gudev/docs/gudev-sections.txt
diff --git a/src/extras/gudev/docs/gudev.types b/src/gudev/docs/gudev.types
index a89857a04d..a89857a04d 100644
--- a/src/extras/gudev/docs/gudev.types
+++ b/src/gudev/docs/gudev.types
diff --git a/src/extras/gudev/docs/version.xml.in b/src/gudev/docs/version.xml.in
index d78bda9342..d78bda9342 100644
--- a/src/extras/gudev/docs/version.xml.in
+++ b/src/gudev/docs/version.xml.in
diff --git a/src/extras/gudev/gjs-example.js b/src/gudev/gjs-example.js
index 5586fd6a61..5586fd6a61 100755
--- a/src/extras/gudev/gjs-example.js
+++ b/src/gudev/gjs-example.js
diff --git a/src/extras/gudev/gudev-1.0.pc.in b/src/gudev/gudev-1.0.pc.in
index 058262d767..058262d767 100644
--- a/src/extras/gudev/gudev-1.0.pc.in
+++ b/src/gudev/gudev-1.0.pc.in
diff --git a/src/extras/gudev/gudev.h b/src/gudev/gudev.h
index a313460817..a313460817 100644
--- a/src/extras/gudev/gudev.h
+++ b/src/gudev/gudev.h
diff --git a/src/extras/gudev/gudevclient.c b/src/gudev/gudevclient.c
index 2b94102ac5..2b94102ac5 100644
--- a/src/extras/gudev/gudevclient.c
+++ b/src/gudev/gudevclient.c
diff --git a/src/extras/gudev/gudevclient.h b/src/gudev/gudevclient.h
index b425d03d48..b425d03d48 100644
--- a/src/extras/gudev/gudevclient.h
+++ b/src/gudev/gudevclient.h
diff --git a/src/extras/gudev/gudevdevice.c b/src/gudev/gudevdevice.c
index 62a26f99b7..62a26f99b7 100644
--- a/src/extras/gudev/gudevdevice.c
+++ b/src/gudev/gudevdevice.c
diff --git a/src/extras/gudev/gudevdevice.h b/src/gudev/gudevdevice.h
index d4873bad0f..d4873bad0f 100644
--- a/src/extras/gudev/gudevdevice.h
+++ b/src/gudev/gudevdevice.h
diff --git a/src/extras/gudev/gudevenumerator.c b/src/gudev/gudevenumerator.c
index db09074625..db09074625 100644
--- a/src/extras/gudev/gudevenumerator.c
+++ b/src/gudev/gudevenumerator.c
diff --git a/src/extras/gudev/gudevenumerator.h b/src/gudev/gudevenumerator.h
index 3fddccf573..3fddccf573 100644
--- a/src/extras/gudev/gudevenumerator.h
+++ b/src/gudev/gudevenumerator.h
diff --git a/src/extras/gudev/gudevenums.h b/src/gudev/gudevenums.h
index c3a0aa8747..c3a0aa8747 100644
--- a/src/extras/gudev/gudevenums.h
+++ b/src/gudev/gudevenums.h
diff --git a/src/extras/gudev/gudevenumtypes.c.template b/src/gudev/gudevenumtypes.c.template
index fc30b39e2e..fc30b39e2e 100644
--- a/src/extras/gudev/gudevenumtypes.c.template
+++ b/src/gudev/gudevenumtypes.c.template
diff --git a/src/extras/gudev/gudevenumtypes.h.template b/src/gudev/gudevenumtypes.h.template
index d0ab3393e6..d0ab3393e6 100644
--- a/src/extras/gudev/gudevenumtypes.h.template
+++ b/src/gudev/gudevenumtypes.h.template
diff --git a/src/extras/gudev/gudevmarshal.list b/src/gudev/gudevmarshal.list
index 7e665999e8..7e665999e8 100644
--- a/src/extras/gudev/gudevmarshal.list
+++ b/src/gudev/gudevmarshal.list
diff --git a/src/extras/gudev/gudevprivate.h b/src/gudev/gudevprivate.h
index 8866f52b88..8866f52b88 100644
--- a/src/extras/gudev/gudevprivate.h
+++ b/src/gudev/gudevprivate.h
diff --git a/src/extras/gudev/gudevtypes.h b/src/gudev/gudevtypes.h
index 888482783d..888482783d 100644
--- a/src/extras/gudev/gudevtypes.h
+++ b/src/gudev/gudevtypes.h
diff --git a/src/extras/gudev/seed-example-enum.js b/src/gudev/seed-example-enum.js
index 66206ad806..66206ad806 100755
--- a/src/extras/gudev/seed-example-enum.js
+++ b/src/gudev/seed-example-enum.js
diff --git a/src/extras/gudev/seed-example.js b/src/gudev/seed-example.js
index e2ac324d23..e2ac324d23 100755
--- a/src/extras/gudev/seed-example.js
+++ b/src/gudev/seed-example.js
diff --git a/src/extras/keymap/.gitignore b/src/keymap/.gitignore
index 01d62e2b6e..01d62e2b6e 100644
--- a/src/extras/keymap/.gitignore
+++ b/src/keymap/.gitignore
diff --git a/src/extras/keymap/95-keyboard-force-release.rules b/src/keymap/95-keyboard-force-release.rules
index 79a1bc1cc4..79a1bc1cc4 100644
--- a/src/extras/keymap/95-keyboard-force-release.rules
+++ b/src/keymap/95-keyboard-force-release.rules
diff --git a/src/extras/keymap/95-keymap.rules b/src/keymap/95-keymap.rules
index 26de03dcc7..26de03dcc7 100644
--- a/src/extras/keymap/95-keymap.rules
+++ b/src/keymap/95-keymap.rules
diff --git a/src/extras/keymap/README.keymap.txt b/src/keymap/README.keymap.txt
index 52d50ed2de..52d50ed2de 100644
--- a/src/extras/keymap/README.keymap.txt
+++ b/src/keymap/README.keymap.txt
diff --git a/src/extras/keymap/check-keymaps.sh b/src/keymap/check-keymaps.sh
index 423699b5a8..405168c667 100755
--- a/src/extras/keymap/check-keymaps.sh
+++ b/src/keymap/check-keymaps.sh
@@ -4,9 +4,9 @@
 # and that all key maps listed in the rules are valid and present in
 # Makefile.am
 SRCDIR=${1:-.}
-KEYLIST=${2:-src/extras/keymap/keys.txt}
-KEYMAPS_DIR=$SRCDIR/src/extras/keymap/keymaps
-RULES=$SRCDIR/src/extras/keymap/95-keymap.rules
+KEYLIST=${2:-src/keymap/keys.txt}
+KEYMAPS_DIR=$SRCDIR/src/keymap/keymaps
+RULES=$SRCDIR/src/keymap/95-keymap.rules
 
 [ -e "$KEYLIST" ] || {
         echo "need $KEYLIST please build first" >&2
@@ -16,7 +16,7 @@ RULES=$SRCDIR/src/extras/keymap/95-keymap.rules
 missing=$(join -v 2 <(awk '{print tolower(substr($1,5))}' $KEYLIST | sort -u) \
                     <(grep -hv '^#' ${KEYMAPS_DIR}/*| awk '{print $2}' | sort -u))
 [ -z "$missing" ] || {
-        echo "ERROR: unknown key names in src/extras/keymap/keymaps/*:" >&2
+        echo "ERROR: unknown key names in src/keymap/keymaps/*:" >&2
         echo "$missing" >&2
         exit 1
 }
@@ -31,7 +31,7 @@ for m in $maps; do
                 echo "ERROR: unknown map name in $RULES: $m" >&2
                 exit 1
         }
-        grep -q "src/extras/keymap/keymaps/$m\>" $SRCDIR/Makefile.am || {
+        grep -q "src/keymap/keymaps/$m\>" $SRCDIR/Makefile.am || {
                 echo "ERROR: map file $m is not added to Makefile.am" >&2
                 exit 1
         }
diff --git a/src/extras/keymap/findkeyboards b/src/keymap/findkeyboards
index 9ce27429b2..9ce27429b2 100755
--- a/src/extras/keymap/findkeyboards
+++ b/src/keymap/findkeyboards
diff --git a/src/extras/keymap/force-release-maps/common-volume-keys b/src/keymap/force-release-maps/common-volume-keys
index 3a7654d735..3a7654d735 100644
--- a/src/extras/keymap/force-release-maps/common-volume-keys
+++ b/src/keymap/force-release-maps/common-volume-keys
diff --git a/src/extras/keymap/force-release-maps/dell-touchpad b/src/keymap/force-release-maps/dell-touchpad
index 18e9bdee66..18e9bdee66 100644
--- a/src/extras/keymap/force-release-maps/dell-touchpad
+++ b/src/keymap/force-release-maps/dell-touchpad
diff --git a/src/extras/keymap/force-release-maps/hp-other b/src/keymap/force-release-maps/hp-other
index 6621370095..6621370095 100644
--- a/src/extras/keymap/force-release-maps/hp-other
+++ b/src/keymap/force-release-maps/hp-other
diff --git a/src/extras/keymap/force-release-maps/samsung-other b/src/keymap/force-release-maps/samsung-other
index c51123a0b6..c51123a0b6 100644
--- a/src/extras/keymap/force-release-maps/samsung-other
+++ b/src/keymap/force-release-maps/samsung-other
diff --git a/src/extras/keymap/keyboard-force-release.sh.in b/src/keymap/keyboard-force-release.sh.in
index dd040cebc3..dd040cebc3 100755
--- a/src/extras/keymap/keyboard-force-release.sh.in
+++ b/src/keymap/keyboard-force-release.sh.in
diff --git a/src/extras/keymap/keymap.c b/src/keymap/keymap.c
index 92ec67b3a6..92ec67b3a6 100644
--- a/src/extras/keymap/keymap.c
+++ b/src/keymap/keymap.c
diff --git a/src/extras/keymap/keymaps/acer b/src/keymap/keymaps/acer
index 4e7c297dea..4e7c297dea 100644
--- a/src/extras/keymap/keymaps/acer
+++ b/src/keymap/keymaps/acer
diff --git a/src/extras/keymap/keymaps/acer-aspire_5720 b/src/keymap/keymaps/acer-aspire_5720
index 1496d63a52..1496d63a52 100644
--- a/src/extras/keymap/keymaps/acer-aspire_5720
+++ b/src/keymap/keymaps/acer-aspire_5720
diff --git a/src/extras/keymap/keymaps/acer-aspire_5920g b/src/keymap/keymaps/acer-aspire_5920g
index 633c4e854c..633c4e854c 100644
--- a/src/extras/keymap/keymaps/acer-aspire_5920g
+++ b/src/keymap/keymaps/acer-aspire_5920g
diff --git a/src/extras/keymap/keymaps/acer-aspire_6920 b/src/keymap/keymaps/acer-aspire_6920
index 699c954b4e..699c954b4e 100644
--- a/src/extras/keymap/keymaps/acer-aspire_6920
+++ b/src/keymap/keymaps/acer-aspire_6920
diff --git a/src/extras/keymap/keymaps/acer-aspire_8930 b/src/keymap/keymaps/acer-aspire_8930
index fb27bfb4f5..fb27bfb4f5 100644
--- a/src/extras/keymap/keymaps/acer-aspire_8930
+++ b/src/keymap/keymaps/acer-aspire_8930
diff --git a/src/extras/keymap/keymaps/acer-travelmate_c300 b/src/keymap/keymaps/acer-travelmate_c300
index bfef4cf868..bfef4cf868 100644
--- a/src/extras/keymap/keymaps/acer-travelmate_c300
+++ b/src/keymap/keymaps/acer-travelmate_c300
diff --git a/src/extras/keymap/keymaps/asus b/src/keymap/keymaps/asus
index 2a5995f982..2a5995f982 100644
--- a/src/extras/keymap/keymaps/asus
+++ b/src/keymap/keymaps/asus
diff --git a/src/extras/keymap/keymaps/compaq-e_evo b/src/keymap/keymaps/compaq-e_evo
index 5fbc573aa4..5fbc573aa4 100644
--- a/src/extras/keymap/keymaps/compaq-e_evo
+++ b/src/keymap/keymaps/compaq-e_evo
diff --git a/src/extras/keymap/keymaps/dell b/src/keymap/keymaps/dell
index 4f907b3eef..4f907b3eef 100644
--- a/src/extras/keymap/keymaps/dell
+++ b/src/keymap/keymaps/dell
diff --git a/src/extras/keymap/keymaps/dell-latitude-xt2 b/src/keymap/keymaps/dell-latitude-xt2
index 39872f559d..39872f559d 100644
--- a/src/extras/keymap/keymaps/dell-latitude-xt2
+++ b/src/keymap/keymaps/dell-latitude-xt2
diff --git a/src/extras/keymap/keymaps/everex-xt5000 b/src/keymap/keymaps/everex-xt5000
index 4823a832f5..4823a832f5 100644
--- a/src/extras/keymap/keymaps/everex-xt5000
+++ b/src/keymap/keymaps/everex-xt5000
diff --git a/src/extras/keymap/keymaps/fujitsu-amilo_li_2732 b/src/keymap/keymaps/fujitsu-amilo_li_2732
index 9b8b36a170..9b8b36a170 100644
--- a/src/extras/keymap/keymaps/fujitsu-amilo_li_2732
+++ b/src/keymap/keymaps/fujitsu-amilo_li_2732
diff --git a/src/extras/keymap/keymaps/fujitsu-amilo_pa_2548 b/src/keymap/keymaps/fujitsu-amilo_pa_2548
index f7b0c52444..f7b0c52444 100644
--- a/src/extras/keymap/keymaps/fujitsu-amilo_pa_2548
+++ b/src/keymap/keymaps/fujitsu-amilo_pa_2548
diff --git a/src/extras/keymap/keymaps/fujitsu-amilo_pro_edition_v3505 b/src/keymap/keymaps/fujitsu-amilo_pro_edition_v3505
index d2e38cbb23..d2e38cbb23 100644
--- a/src/extras/keymap/keymaps/fujitsu-amilo_pro_edition_v3505
+++ b/src/keymap/keymaps/fujitsu-amilo_pro_edition_v3505
diff --git a/src/extras/keymap/keymaps/fujitsu-amilo_pro_v3205 b/src/keymap/keymaps/fujitsu-amilo_pro_v3205
index 43e3199d59..43e3199d59 100644
--- a/src/extras/keymap/keymaps/fujitsu-amilo_pro_v3205
+++ b/src/keymap/keymaps/fujitsu-amilo_pro_v3205
diff --git a/src/extras/keymap/keymaps/fujitsu-amilo_si_1520 b/src/keymap/keymaps/fujitsu-amilo_si_1520
index 1419bd9b5e..1419bd9b5e 100644
--- a/src/extras/keymap/keymaps/fujitsu-amilo_si_1520
+++ b/src/keymap/keymaps/fujitsu-amilo_si_1520
diff --git a/src/extras/keymap/keymaps/fujitsu-esprimo_mobile_v5 b/src/keymap/keymaps/fujitsu-esprimo_mobile_v5
index d3d056b366..d3d056b366 100644
--- a/src/extras/keymap/keymaps/fujitsu-esprimo_mobile_v5
+++ b/src/keymap/keymaps/fujitsu-esprimo_mobile_v5
diff --git a/src/extras/keymap/keymaps/fujitsu-esprimo_mobile_v6 b/src/keymap/keymaps/fujitsu-esprimo_mobile_v6
index 52c70c50cb..52c70c50cb 100644
--- a/src/extras/keymap/keymaps/fujitsu-esprimo_mobile_v6
+++ b/src/keymap/keymaps/fujitsu-esprimo_mobile_v6
diff --git a/src/extras/keymap/keymaps/genius-slimstar-320 b/src/keymap/keymaps/genius-slimstar-320
index d0a3656dd8..d0a3656dd8 100644
--- a/src/extras/keymap/keymaps/genius-slimstar-320
+++ b/src/keymap/keymaps/genius-slimstar-320
diff --git a/src/extras/keymap/keymaps/hewlett-packard b/src/keymap/keymaps/hewlett-packard
index 4461fa2ce5..4461fa2ce5 100644
--- a/src/extras/keymap/keymaps/hewlett-packard
+++ b/src/keymap/keymaps/hewlett-packard
diff --git a/src/extras/keymap/keymaps/hewlett-packard-2510p_2530p b/src/keymap/keymaps/hewlett-packard-2510p_2530p
index 41ad2e9b5a..41ad2e9b5a 100644
--- a/src/extras/keymap/keymaps/hewlett-packard-2510p_2530p
+++ b/src/keymap/keymaps/hewlett-packard-2510p_2530p
diff --git a/src/extras/keymap/keymaps/hewlett-packard-compaq_elitebook b/src/keymap/keymaps/hewlett-packard-compaq_elitebook
index 42007c5483..42007c5483 100644
--- a/src/extras/keymap/keymaps/hewlett-packard-compaq_elitebook
+++ b/src/keymap/keymaps/hewlett-packard-compaq_elitebook
diff --git a/src/extras/keymap/keymaps/hewlett-packard-pavilion b/src/keymap/keymaps/hewlett-packard-pavilion
index 3d3cefc8e6..3d3cefc8e6 100644
--- a/src/extras/keymap/keymaps/hewlett-packard-pavilion
+++ b/src/keymap/keymaps/hewlett-packard-pavilion
diff --git a/src/extras/keymap/keymaps/hewlett-packard-presario-2100 b/src/keymap/keymaps/hewlett-packard-presario-2100
index 1df39dcbd2..1df39dcbd2 100644
--- a/src/extras/keymap/keymaps/hewlett-packard-presario-2100
+++ b/src/keymap/keymaps/hewlett-packard-presario-2100
diff --git a/src/extras/keymap/keymaps/hewlett-packard-tablet b/src/keymap/keymaps/hewlett-packard-tablet
index d19005ab90..d19005ab90 100644
--- a/src/extras/keymap/keymaps/hewlett-packard-tablet
+++ b/src/keymap/keymaps/hewlett-packard-tablet
diff --git a/src/extras/keymap/keymaps/hewlett-packard-tx2 b/src/keymap/keymaps/hewlett-packard-tx2
index 36a690fcf6..36a690fcf6 100644
--- a/src/extras/keymap/keymaps/hewlett-packard-tx2
+++ b/src/keymap/keymaps/hewlett-packard-tx2
diff --git a/src/extras/keymap/keymaps/ibm-thinkpad-usb-keyboard-trackpoint b/src/keymap/keymaps/ibm-thinkpad-usb-keyboard-trackpoint
index 027e50bf88..027e50bf88 100644
--- a/src/extras/keymap/keymaps/ibm-thinkpad-usb-keyboard-trackpoint
+++ b/src/keymap/keymaps/ibm-thinkpad-usb-keyboard-trackpoint
diff --git a/src/extras/keymap/keymaps/inventec-symphony_6.0_7.0 b/src/keymap/keymaps/inventec-symphony_6.0_7.0
index 4a8b4ba5a7..4a8b4ba5a7 100644
--- a/src/extras/keymap/keymaps/inventec-symphony_6.0_7.0
+++ b/src/keymap/keymaps/inventec-symphony_6.0_7.0
diff --git a/src/extras/keymap/keymaps/lenovo-3000 b/src/keymap/keymaps/lenovo-3000
index 5bd165654a..5bd165654a 100644
--- a/src/extras/keymap/keymaps/lenovo-3000
+++ b/src/keymap/keymaps/lenovo-3000
diff --git a/src/extras/keymap/keymaps/lenovo-ideapad b/src/keymap/keymaps/lenovo-ideapad
index fc339839f2..fc339839f2 100644
--- a/src/extras/keymap/keymaps/lenovo-ideapad
+++ b/src/keymap/keymaps/lenovo-ideapad
diff --git a/src/extras/keymap/keymaps/lenovo-thinkpad-usb-keyboard-trackpoint b/src/keymap/keymaps/lenovo-thinkpad-usb-keyboard-trackpoint
index 47e8846a68..47e8846a68 100644
--- a/src/extras/keymap/keymaps/lenovo-thinkpad-usb-keyboard-trackpoint
+++ b/src/keymap/keymaps/lenovo-thinkpad-usb-keyboard-trackpoint
diff --git a/src/extras/keymap/keymaps/lenovo-thinkpad_x200_tablet b/src/keymap/keymaps/lenovo-thinkpad_x200_tablet
index 31ea3b2c70..31ea3b2c70 100644
--- a/src/extras/keymap/keymaps/lenovo-thinkpad_x200_tablet
+++ b/src/keymap/keymaps/lenovo-thinkpad_x200_tablet
diff --git a/src/extras/keymap/keymaps/lenovo-thinkpad_x6_tablet b/src/keymap/keymaps/lenovo-thinkpad_x6_tablet
index 6fd16b5662..6fd16b5662 100644
--- a/src/extras/keymap/keymaps/lenovo-thinkpad_x6_tablet
+++ b/src/keymap/keymaps/lenovo-thinkpad_x6_tablet
diff --git a/src/extras/keymap/keymaps/lg-x110 b/src/keymap/keymaps/lg-x110
index ba08cba3fe..ba08cba3fe 100644
--- a/src/extras/keymap/keymaps/lg-x110
+++ b/src/keymap/keymaps/lg-x110
diff --git a/src/extras/keymap/keymaps/logitech-wave b/src/keymap/keymaps/logitech-wave
index caa5d5d310..caa5d5d310 100644
--- a/src/extras/keymap/keymaps/logitech-wave
+++ b/src/keymap/keymaps/logitech-wave
diff --git a/src/extras/keymap/keymaps/logitech-wave-cordless b/src/keymap/keymaps/logitech-wave-cordless
index a10dad5e4d..a10dad5e4d 100644
--- a/src/extras/keymap/keymaps/logitech-wave-cordless
+++ b/src/keymap/keymaps/logitech-wave-cordless
diff --git a/src/extras/keymap/keymaps/logitech-wave-pro-cordless b/src/keymap/keymaps/logitech-wave-pro-cordless
index e7aa02206c..e7aa02206c 100644
--- a/src/extras/keymap/keymaps/logitech-wave-pro-cordless
+++ b/src/keymap/keymaps/logitech-wave-pro-cordless
diff --git a/src/extras/keymap/keymaps/maxdata-pro_7000 b/src/keymap/keymaps/maxdata-pro_7000
index c0e4f77af4..c0e4f77af4 100644
--- a/src/extras/keymap/keymaps/maxdata-pro_7000
+++ b/src/keymap/keymaps/maxdata-pro_7000
diff --git a/src/extras/keymap/keymaps/medion-fid2060 b/src/keymap/keymaps/medion-fid2060
index 5a76c76799..5a76c76799 100644
--- a/src/extras/keymap/keymaps/medion-fid2060
+++ b/src/keymap/keymaps/medion-fid2060
diff --git a/src/extras/keymap/keymaps/medionnb-a555 b/src/keymap/keymaps/medionnb-a555
index c3b5dfa60b..c3b5dfa60b 100644
--- a/src/extras/keymap/keymaps/medionnb-a555
+++ b/src/keymap/keymaps/medionnb-a555
diff --git a/src/extras/keymap/keymaps/micro-star b/src/keymap/keymaps/micro-star
index 4a438698ed..4a438698ed 100644
--- a/src/extras/keymap/keymaps/micro-star
+++ b/src/keymap/keymaps/micro-star
diff --git a/src/extras/keymap/keymaps/module-asus-w3j b/src/keymap/keymaps/module-asus-w3j
index 773e0b3e82..773e0b3e82 100644
--- a/src/extras/keymap/keymaps/module-asus-w3j
+++ b/src/keymap/keymaps/module-asus-w3j
diff --git a/src/extras/keymap/keymaps/module-ibm b/src/keymap/keymaps/module-ibm
index a92dfa2506..a92dfa2506 100644
--- a/src/extras/keymap/keymaps/module-ibm
+++ b/src/keymap/keymaps/module-ibm
diff --git a/src/extras/keymap/keymaps/module-lenovo b/src/keymap/keymaps/module-lenovo
index 8e38883091..8e38883091 100644
--- a/src/extras/keymap/keymaps/module-lenovo
+++ b/src/keymap/keymaps/module-lenovo
diff --git a/src/extras/keymap/keymaps/module-sony b/src/keymap/keymaps/module-sony
index 7c000131d1..7c000131d1 100644
--- a/src/extras/keymap/keymaps/module-sony
+++ b/src/keymap/keymaps/module-sony
diff --git a/src/extras/keymap/keymaps/module-sony-old b/src/keymap/keymaps/module-sony-old
index 596a34258a..596a34258a 100644
--- a/src/extras/keymap/keymaps/module-sony-old
+++ b/src/keymap/keymaps/module-sony-old
diff --git a/src/extras/keymap/keymaps/module-sony-vgn b/src/keymap/keymaps/module-sony-vgn
index c8ba001516..c8ba001516 100644
--- a/src/extras/keymap/keymaps/module-sony-vgn
+++ b/src/keymap/keymaps/module-sony-vgn
diff --git a/src/extras/keymap/keymaps/olpc-xo b/src/keymap/keymaps/olpc-xo
index 34434a121d..34434a121d 100644
--- a/src/extras/keymap/keymaps/olpc-xo
+++ b/src/keymap/keymaps/olpc-xo
diff --git a/src/extras/keymap/keymaps/onkyo b/src/keymap/keymaps/onkyo
index ee864ade4d..ee864ade4d 100644
--- a/src/extras/keymap/keymaps/onkyo
+++ b/src/keymap/keymaps/onkyo
diff --git a/src/extras/keymap/keymaps/oqo-model2 b/src/keymap/keymaps/oqo-model2
index b7f4851abe..b7f4851abe 100644
--- a/src/extras/keymap/keymaps/oqo-model2
+++ b/src/keymap/keymaps/oqo-model2
diff --git a/src/extras/keymap/keymaps/samsung-other b/src/keymap/keymaps/samsung-other
index 3ac0c2f10c..3ac0c2f10c 100644
--- a/src/extras/keymap/keymaps/samsung-other
+++ b/src/keymap/keymaps/samsung-other
diff --git a/src/extras/keymap/keymaps/samsung-sq1us b/src/keymap/keymaps/samsung-sq1us
index ea2141ef84..ea2141ef84 100644
--- a/src/extras/keymap/keymaps/samsung-sq1us
+++ b/src/keymap/keymaps/samsung-sq1us
diff --git a/src/extras/keymap/keymaps/samsung-sx20s b/src/keymap/keymaps/samsung-sx20s
index 9d954ee415..9d954ee415 100644
--- a/src/extras/keymap/keymaps/samsung-sx20s
+++ b/src/keymap/keymaps/samsung-sx20s
diff --git a/src/extras/keymap/keymaps/toshiba-satellite_a100 b/src/keymap/keymaps/toshiba-satellite_a100
index 22007be71b..22007be71b 100644
--- a/src/extras/keymap/keymaps/toshiba-satellite_a100
+++ b/src/keymap/keymaps/toshiba-satellite_a100
diff --git a/src/extras/keymap/keymaps/toshiba-satellite_a110 b/src/keymap/keymaps/toshiba-satellite_a110
index 1429409351..1429409351 100644
--- a/src/extras/keymap/keymaps/toshiba-satellite_a110
+++ b/src/keymap/keymaps/toshiba-satellite_a110
diff --git a/src/extras/keymap/keymaps/toshiba-satellite_m30x b/src/keymap/keymaps/toshiba-satellite_m30x
index ae8e34941b..ae8e34941b 100644
--- a/src/extras/keymap/keymaps/toshiba-satellite_m30x
+++ b/src/keymap/keymaps/toshiba-satellite_m30x
diff --git a/src/extras/keymap/keymaps/zepto-znote b/src/keymap/keymaps/zepto-znote
index cf72fda47b..cf72fda47b 100644
--- a/src/extras/keymap/keymaps/zepto-znote
+++ b/src/keymap/keymaps/zepto-znote
diff --git a/src/libudev-queue.c b/src/libudev-queue.c
index 7a4b563cfa..0e82cb6ae8 100644
--- a/src/libudev-queue.c
+++ b/src/libudev-queue.c
@@ -322,7 +322,7 @@ UDEV_EXPORT int udev_queue_get_queue_is_empty(struct udev_queue *udev_queue)
         seqnum_kernel = udev_queue_get_kernel_seqnum(udev_queue);
         if (seqnum_udev < seqnum_kernel) {
                 dbg(udev_queue->udev, "queue is empty but kernel events still pending [%llu]<->[%llu]\n",
-                                        seqnum_kernel, seqnum_udev);
+                                      seqnum_kernel, seqnum_udev);
                 goto out;
         }
 
diff --git a/src/extras/mtd_probe/.gitignore b/src/mtd_probe/.gitignore
index 82b8ab501f..82b8ab501f 100644
--- a/src/extras/mtd_probe/.gitignore
+++ b/src/mtd_probe/.gitignore
diff --git a/src/extras/mtd_probe/75-probe_mtd.rules b/src/mtd_probe/75-probe_mtd.rules
index c0e0839785..c0e0839785 100644
--- a/src/extras/mtd_probe/75-probe_mtd.rules
+++ b/src/mtd_probe/75-probe_mtd.rules
diff --git a/src/extras/mtd_probe/mtd_probe.c b/src/mtd_probe/mtd_probe.c
index 1aa08d3851..1aa08d3851 100644
--- a/src/extras/mtd_probe/mtd_probe.c
+++ b/src/mtd_probe/mtd_probe.c
diff --git a/src/extras/mtd_probe/mtd_probe.h b/src/mtd_probe/mtd_probe.h
index 2a37ede578..2a37ede578 100644
--- a/src/extras/mtd_probe/mtd_probe.h
+++ b/src/mtd_probe/mtd_probe.h
diff --git a/src/extras/mtd_probe/probe_smartmedia.c b/src/mtd_probe/probe_smartmedia.c
index b3cdefc633..b3cdefc633 100644
--- a/src/extras/mtd_probe/probe_smartmedia.c
+++ b/src/mtd_probe/probe_smartmedia.c
diff --git a/src/extras/qemu/42-qemu-usb.rules b/src/qemu/42-qemu-usb.rules
index a4e3864714..a4e3864714 100644
--- a/src/extras/qemu/42-qemu-usb.rules
+++ b/src/qemu/42-qemu-usb.rules
diff --git a/src/extras/rule_generator/75-cd-aliases-generator.rules b/src/rule_generator/75-cd-aliases-generator.rules
index e6da0101d6..e6da0101d6 100644
--- a/src/extras/rule_generator/75-cd-aliases-generator.rules
+++ b/src/rule_generator/75-cd-aliases-generator.rules
diff --git a/src/extras/rule_generator/75-persistent-net-generator.rules b/src/rule_generator/75-persistent-net-generator.rules
index 4f80573478..4f80573478 100644
--- a/src/extras/rule_generator/75-persistent-net-generator.rules
+++ b/src/rule_generator/75-persistent-net-generator.rules
diff --git a/src/extras/rule_generator/rule_generator.functions b/src/rule_generator/rule_generator.functions
index 2eec1b6abf..2eec1b6abf 100644
--- a/src/extras/rule_generator/rule_generator.functions
+++ b/src/rule_generator/rule_generator.functions
diff --git a/src/extras/rule_generator/write_cd_rules b/src/rule_generator/write_cd_rules
index 645b9cd521..645b9cd521 100644
--- a/src/extras/rule_generator/write_cd_rules
+++ b/src/rule_generator/write_cd_rules
diff --git a/src/extras/rule_generator/write_net_rules b/src/rule_generator/write_net_rules
index bcea4b09dc..bcea4b09dc 100644
--- a/src/extras/rule_generator/write_net_rules
+++ b/src/rule_generator/write_net_rules
diff --git a/src/extras/scsi_id/.gitignore b/src/scsi_id/.gitignore
index 10e9ae743c..10e9ae743c 100644
--- a/src/extras/scsi_id/.gitignore
+++ b/src/scsi_id/.gitignore
diff --git a/src/extras/scsi_id/README b/src/scsi_id/README
index 9cfe73991c..9cfe73991c 100644
--- a/src/extras/scsi_id/README
+++ b/src/scsi_id/README
diff --git a/src/extras/scsi_id/scsi.h b/src/scsi_id/scsi.h
index c423cac574..c423cac574 100644
--- a/src/extras/scsi_id/scsi.h
+++ b/src/scsi_id/scsi.h
diff --git a/src/extras/scsi_id/scsi_id.8 b/src/scsi_id/scsi_id.8
index 0d4dba9149..0d4dba9149 100644
--- a/src/extras/scsi_id/scsi_id.8
+++ b/src/scsi_id/scsi_id.8
diff --git a/src/extras/scsi_id/scsi_id.c b/src/scsi_id/scsi_id.c
index 9bb0d7f538..9bb0d7f538 100644
--- a/src/extras/scsi_id/scsi_id.c
+++ b/src/scsi_id/scsi_id.c
diff --git a/src/extras/scsi_id/scsi_id.h b/src/scsi_id/scsi_id.h
index 828a98305f..828a98305f 100644
--- a/src/extras/scsi_id/scsi_id.h
+++ b/src/scsi_id/scsi_id.h
diff --git a/src/extras/scsi_id/scsi_serial.c b/src/scsi_id/scsi_serial.c
index f1d63f40cc..f1d63f40cc 100644
--- a/src/extras/scsi_id/scsi_serial.c
+++ b/src/scsi_id/scsi_serial.c
diff --git a/src/extras/v4l_id/.gitignore b/src/v4l_id/.gitignore
index dffced9f08..dffced9f08 100644
--- a/src/extras/v4l_id/.gitignore
+++ b/src/v4l_id/.gitignore
diff --git a/src/extras/v4l_id/60-persistent-v4l.rules b/src/v4l_id/60-persistent-v4l.rules
index 93c5ee8c27..93c5ee8c27 100644
--- a/src/extras/v4l_id/60-persistent-v4l.rules
+++ b/src/v4l_id/60-persistent-v4l.rules
diff --git a/src/extras/v4l_id/v4l_id.c b/src/v4l_id/v4l_id.c
index a2a80b5f43..a2a80b5f43 100644
--- a/src/extras/v4l_id/v4l_id.c
+++ b/src/v4l_id/v4l_id.c