diff --git a/Makefile.am b/Makefile.am
index 6861392..41084be 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -17,11 +17,13 @@ SUBDIRS += libtriple
 libstb_hal_la_LIBADD += \
 	libtriple/libtriple.la
 endif
+
 if BOXTYPE_AZBOX
 SUBDIRS += libazbox
 libstb_hal_la_LIBADD += \
 	libazbox/libazbox.la
 endif
+
 if BOXTYPE_GENERIC
 if BOXMODEL_RASPI
 SUBDIRS += libraspi
@@ -33,6 +35,7 @@ libstb_hal_la_LIBADD += \
 	libgeneric-pc/libgeneric.la
 endif
 endif
+
 if BOXTYPE_SPARK
 #libstb_hal_test_LDADD += -lasound
 SUBDIRS += libspark libeplayer3-sh4
@@ -40,6 +43,7 @@ libstb_hal_la_LIBADD += \
 	libspark/libspark.la \
 	libeplayer3-sh4/libeplayer3_sh4.la
 endif
+
 if BOXTYPE_DUCKBOX
 #libstb_hal_test_LDADD += -lasound
 SUBDIRS += libduckbox libeplayer3-sh4 libdvbci
@@ -48,6 +52,7 @@ libstb_hal_la_LIBADD += \
 	libeplayer3-sh4/libeplayer3_sh4.la \
 	libdvbci/libdvbci.la
 endif
+
 if BOXTYPE_ARMBOX
 if BOXMODEL_HD60
 SUBDIRS += libarmbox
@@ -59,32 +64,10 @@ SUBDIRS += libarmbox libdvbci
 libstb_hal_la_LIBADD += \
 	libarmbox/libarmbox.la \
 	libdvbci/libdvbci.la
-
 if !ENABLE_GSTREAMER_10
 SUBDIRS += libeplayer3-arm
-
 libstb_hal_la_LIBADD += \
 	libeplayer3-arm/libeplayer3_arm.la
 endif
-
 endif
-
 endif
-
-pkginclude_HEADERS = \
-	include/audio_hal.h \
-	include/ca.h \
-	include/ca_ci.h \
-	include/ca_hal.h \
-	include/cs_api.h \
-	include/cs_types.h \
-	include/dmx_hal.h \
-	include/glfb.h \
-	include/hardware_caps.h \
-	include/init.h \
-	include/mmi.h \
-	include/playback_hal.h \
-	include/pwrmngr.h \
-	include/record_hal.h \
-	include/version_hal.h \
-	include/video_hal.h