--- strongswan-5.3.3/src/libcharon/Makefile.am	2015-03-21 13:46:05.000000000 +0100
+++ src/src/libcharon/Makefile.am	2015-10-20 17:19:01.857579988 +0200
@@ -132,6 +132,69 @@
 processing/jobs/adopt_children_job.c processing/jobs/adopt_children_job.h
 endif
 
+if USE_DEV_HEADERS
+charon_includedir = ${dev_headers}/charon
+nobase_charon_include_HEADERS = daemon.h				\
+attributes/attribute_manager.h attributes/attributes.h			\
+attributes/attribute_provider.h attributes/mem_pool.h			\
+attributes/attribute_handler.h bus/bus.h bus/listeners/file_logger.h	\
+bus/listeners/sys_logger.h bus/listeners/logger.h			\
+bus/listeners/listener.h config/backend.h config/ike_cfg.h		\
+config/backend_manager.h config/child_cfg.h config/peer_cfg.h		\
+config/proposal.h control/controller.h					\
+encoding/payloads/certreq_payload.h					\
+encoding/payloads/vendor_id_payload.h					\
+encoding/payloads/proposal_substructure.h				\
+encoding/payloads/encrypted_fragment_payload.h				\
+encoding/payloads/traffic_selector_substructure.h			\
+encoding/payloads/endpoint_notify.h encoding/payloads/eap_payload.h	\
+encoding/payloads/transform_attribute.h					\
+encoding/payloads/nonce_payload.h encoding/payloads/encodings.h		\
+encoding/payloads/cp_payload.h encoding/payloads/cert_payload.h		\
+encoding/payloads/ke_payload.h encoding/payloads/delete_payload.h	\
+encoding/payloads/notify_payload.h					\
+encoding/payloads/transform_substructure.h				\
+encoding/payloads/fragment_payload.h encoding/payloads/sa_payload.h	\
+encoding/payloads/auth_payload.h encoding/payloads/id_payload.h		\
+encoding/payloads/payload.h encoding/payloads/encrypted_payload.h	\
+encoding/payloads/ts_payload.h encoding/payloads/hash_payload.h		\
+encoding/payloads/unknown_payload.h encoding/payloads/ike_header.h	\
+encoding/payloads/configuration_attribute.h encoding/generator.h	\
+encoding/message.h encoding/parser.h network/sender.h			\
+network/socket.h network/socket_manager.h network/receiver.h		\
+sa/ikev1/tasks/isakmp_natd.h sa/ikev1/tasks/aggressive_mode.h		\
+sa/ikev1/tasks/isakmp_cert_pre.h sa/ikev1/tasks/quick_delete.h		\
+sa/ikev1/tasks/informational.h sa/ikev1/tasks/isakmp_vendor.h		\
+sa/ikev1/tasks/quick_mode.h sa/ikev1/tasks/mode_config.h		\
+sa/ikev1/tasks/isakmp_cert_post.h sa/ikev1/tasks/main_mode.h		\
+sa/ikev1/tasks/isakmp_delete.h sa/ikev1/tasks/isakmp_dpd.h		\
+sa/ikev1/tasks/xauth.h							\
+sa/ikev1/authenticators/pubkey_v1_authenticator.h			\
+sa/ikev1/authenticators/psk_v1_authenticator.h				\
+sa/ikev1/authenticators/hybrid_authenticator.h sa/ikev1/phase1.h	\
+sa/ikev1/task_manager_v1.h sa/ikev1/keymat_v1.h sa/trap_manager.h	\
+sa/xauth/xauth_method.h sa/xauth/xauth_manager.h sa/ike_sa.h		\
+sa/task_manager.h sa/ike_sa_manager.h sa/child_sa.h sa/ike_sa_id.h	\
+sa/authenticator.h sa/keymat.h sa/task.h sa/shunt_manager.h		\
+sa/child_sa_manager.h sa/ikev2/connect_manager.h			\
+sa/ikev2/tasks/ike_me.h sa/ikev2/tasks/child_delete.h			\
+sa/ikev2/tasks/ike_rekey.h sa/ikev2/tasks/ike_mobike.h			\
+sa/ikev2/tasks/ike_reauth_complete.h sa/ikev2/tasks/ike_reauth.h	\
+sa/ikev2/tasks/ike_auth_lifetime.h sa/ikev2/tasks/child_rekey.h		\
+sa/ikev2/tasks/ike_dpd.h sa/ikev2/tasks/ike_config.h			\
+sa/ikev2/tasks/ike_cert_post.h sa/ikev2/tasks/ike_vendor.h		\
+sa/ikev2/tasks/ike_natd.h sa/ikev2/tasks/ike_cert_pre.h			\
+sa/ikev2/tasks/ike_auth.h sa/ikev2/tasks/ike_delete.h			\
+sa/ikev2/tasks/ike_init.h sa/ikev2/tasks/child_create.h			\
+sa/ikev2/authenticators/pubkey_authenticator.h				\
+sa/ikev2/authenticators/eap_authenticator.h				\
+sa/ikev2/authenticators/psk_authenticator.h sa/ikev2/keymat_v2.h	\
+sa/ikev2/mediation_manager.h sa/ikev2/task_manager_v2.h			\
+sa/eap/eap_inner_method.h sa/eap/eap_manager.h sa/eap/eap_method.h
+
+
+endif
+
 if USE_SYSLOG
   libcharon_la_SOURCES += \
     bus/listeners/sys_logger.c bus/listeners/sys_logger.h
--- strongswan-5.3.3/src/libhydra/Makefile.am	2015-03-17 19:17:43.000000000 +0100
+++ src/src/libhydra/Makefile.am	2015-10-20 17:12:48.078663325 +0200
@@ -24,6 +24,13 @@
 
 EXTRA_DIST = Android.mk
 
+if USE_DEV_HEADERS
+hydra_includedir = ${dev_headers}
+nobase_hydra_include_HEADERS = kernel/kernel_listener.h			\
+kernel/kernel_ipsec.h kernel/kernel_interface.h kernel/kernel_net.h \
+hydra.h
+endif
+
 # build optional plugins
 ########################