diff --git a/libnfc/Makefile.am b/libnfc/Makefile.am
index 3a0e988..7fc31ed 100644
--- a/libnfc/Makefile.am
+++ b/libnfc/Makefile.am
@@ -3,15 +3,6 @@ SUBDIRS = chips buses drivers .
 # set the include path found by configure
 AM_CPPFLAGS = $(all_includes) $(LIBNFC_CFLAGS) -DSYSCONFDIR='"$(sysconfdir)"'
 
-noinst_HEADERS = \
-		 conf.h \
-		 drivers.h \
-		 iso7816.h \
-		 log.h \
-		 mirror-subr.h \
-		 nfc-internal.h \
-		 target-subr.h
-
 lib_LTLIBRARIES = libnfc.la
 libnfc_la_SOURCES = \
 		    conf.c \
@@ -22,7 +13,14 @@ libnfc_la_SOURCES = \
 		    nfc-device.c \
 		    nfc-emulation.c \
 		    nfc-internal.c \
-		    target-subr.c
+		    target-subr.c \
+		    conf.h \
+		    drivers.h \
+		    iso7816.h \
+		    log.h \
+		    mirror-subr.h \
+		    nfc-internal.h \
+		    target-subr.h
 
 libnfc_la_LDFLAGS = -no-undefined -version-info 4:0:0 -export-symbols-regex '^nfc_|^iso14443a_|^str_nfc_|pn53x_transceive|pn532_SAMConfiguration|pn53x_read_register|pn53x_write_register'
 libnfc_la_CFLAGS = @DRIVERS_CFLAGS@
diff --git a/libnfc/buses/Makefile.am b/libnfc/buses/Makefile.am
index a5c498d..2ce0720 100644
--- a/libnfc/buses/Makefile.am
+++ b/libnfc/buses/Makefile.am
@@ -2,9 +2,8 @@
 # set the include path found by configure
 AM_CPPFLAGS = $(all_includes) $(LIBNFC_CFLAGS)
 
-noinst_HEADERS = uart.h
 noinst_LTLIBRARIES = libnfcbuses.la
-libnfcbuses_la_SOURCES = uart.c
+libnfcbuses_la_SOURCES = uart.c uart.h
 libnfcbuses_la_CFLAGS = -I$(top_srcdir)/libnfc
 
 EXTRA_DIST = uart_posix.c uart_win32.c
diff --git a/libnfc/chips/Makefile.am b/libnfc/chips/Makefile.am
index db41240..08b46a0 100644
--- a/libnfc/chips/Makefile.am
+++ b/libnfc/chips/Makefile.am
@@ -2,8 +2,7 @@
 # set the include path found by configure
 AM_CPPFLAGS = $(all_includes) $(LIBNFC_CFLAGS)
 
-noinst_HEADERS = pn53x.h pn53x-internal.h
 noinst_LTLIBRARIES = libnfcchips.la
-libnfcchips_la_SOURCES = pn53x.c
+libnfcchips_la_SOURCES = pn53x.c pn53x.h pn53x-internal.h
 libnfcchips_la_CFLAGS = -I$(top_srcdir)/libnfc
 
diff --git a/libnfc/drivers/Makefile.am b/libnfc/drivers/Makefile.am
index 22c5407..1d24924 100644
--- a/libnfc/drivers/Makefile.am
+++ b/libnfc/drivers/Makefile.am
@@ -1,7 +1,6 @@
 # set the include path found by configure
 AM_CPPFLAGS = $(all_includes) $(LIBNFC_CFLAGS)
 
-noinst_HEADERS = acr122_pcsc.h acr122_usb.h acr122s.h arygon.h pn532_uart.h pn53x_usb.h
 noinst_LTLIBRARIES = libnfcdrivers.la
 
 libnfcdrivers_la_SOURCES = 
@@ -9,27 +8,27 @@ libnfcdrivers_la_CFLAGS = @DRIVERS_CFLAGS@ -I$(top_srcdir)/libnfc -I$(top_srcdir
 libnfcdrivers_la_LIBADD = 
 
 if DRIVER_ACR122_PCSC_ENABLED
-libnfcdrivers_la_SOURCES += acr122_pcsc.c
+libnfcdrivers_la_SOURCES += acr122_pcsc.c acr122_pcsc.h
 endif
 
 if DRIVER_ACR122_USB_ENABLED
-libnfcdrivers_la_SOURCES += acr122_usb.c
+libnfcdrivers_la_SOURCES += acr122_usb.c acr122_usb.h
 endif
 
 if DRIVER_ACR122S_ENABLED
-libnfcdrivers_la_SOURCES += acr122s.c
+libnfcdrivers_la_SOURCES += acr122s.c acr122s.h
 endif
 
 if DRIVER_ARYGON_ENABLED
-libnfcdrivers_la_SOURCES += arygon.c
+libnfcdrivers_la_SOURCES += arygon.c arygon.h
 endif
 
 if DRIVER_PN53X_USB_ENABLED
-libnfcdrivers_la_SOURCES += pn53x_usb.c
+libnfcdrivers_la_SOURCES += pn53x_usb.c pn53x_usb.h
 endif
 
 if DRIVER_PN532_UART_ENABLED
-libnfcdrivers_la_SOURCES += pn532_uart.c
+libnfcdrivers_la_SOURCES += pn532_uart.c pn532_uart.h
 endif
 
 if PCSC_ENABLED
diff --git a/utils/Makefile.am b/utils/Makefile.am
index ef43f9d..29fd17e 100644
--- a/utils/Makefile.am
+++ b/utils/Makefile.am
@@ -10,35 +10,34 @@ bin_PROGRAMS = \
 # set the include path found by configure
 AM_CPPFLAGS = $(all_includes) $(LIBNFC_CFLAGS)
 
-noinst_HEADERS = mifare.h nfc-utils.h
 noinst_LTLIBRARIES = libnfcutils.la
 
 libnfcutils_la_SOURCES = nfc-utils.c
 
-nfc_emulate_forum_tag4_SOURCES = nfc-emulate-forum-tag4.c
+nfc_emulate_forum_tag4_SOURCES = nfc-emulate-forum-tag4.c nfc-utils.h
 nfc_emulate_forum_tag4_LDADD = $(top_builddir)/libnfc/libnfc.la \
 			       libnfcutils.la
 
-nfc_list_SOURCES = nfc-list.c
+nfc_list_SOURCES = nfc-list.c nfc-utils.h
 nfc_list_LDADD = $(top_builddir)/libnfc/libnfc.la \
 		 libnfcutils.la
 
-nfc_mfclassic_SOURCES = nfc-mfclassic.c mifare.c mifare.h
+nfc_mfclassic_SOURCES = nfc-mfclassic.c mifare.c mifare.h nfc-utils.h
 nfc_mfclassic_LDADD = $(top_builddir)/libnfc/libnfc.la \
 		    libnfcutils.la
 
-nfc_mfultralight_SOURCES = nfc-mfultralight.c mifare.c mifare.h
+nfc_mfultralight_SOURCES = nfc-mfultralight.c mifare.c mifare.h nfc-utils.h
 nfc_mfultralight_LDADD = $(top_builddir)/libnfc/libnfc.la
 
-nfc_read_forum_tag3_SOURCES = nfc-read-forum-tag3.c
+nfc_read_forum_tag3_SOURCES = nfc-read-forum-tag3.c nfc-utils.h
 nfc_read_forum_tag3_LDADD = $(top_builddir)/libnfc/libnfc.la \
 		            libnfcutils.la
 
-nfc_relay_picc_SOURCES = nfc-relay-picc.c
+nfc_relay_picc_SOURCES = nfc-relay-picc.c nfc-utils.h
 nfc_relay_picc_LDADD = $(top_builddir)/libnfc/libnfc.la \
 		       libnfcutils.la
 
-nfc_scan_device_SOURCES = nfc-scan-device.c
+nfc_scan_device_SOURCES = nfc-scan-device.c nfc-utils.h
 nfc_scan_device_LDADD = $(top_builddir)/libnfc/libnfc.la \
 		 libnfcutils.la