Merged libpts into libimcv

158 files changed, 229 insertions, 430 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index 603c9d164..38363d4f7 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -40,10 +40,6 @@ if USE_IMCV
   SUBDIRS += libimcv
 endif
 
-if USE_PTS
-  SUBDIRS += libpts
-endif
-
 if USE_LIBCHARON
   SUBDIRS += libcharon
 endif
diff --git a/src/checksum/Makefile.am b/src/checksum/Makefile.am
index 821c51747..b358699d0 100644
--- a/src/checksum/Makefile.am
+++ b/src/checksum/Makefile.am
@@ -81,11 +81,6 @@ if USE_IMCV
   libs += $(DESTDIR)$(ipseclibdir)/libimcv.so
 endif
 
-if USE_PTS
-  deps += $(top_builddir)/src/libpts/libpts.la
-  libs += $(DESTDIR)$(ipseclibdir)/libpts.so
-endif
-
 if USE_CHARON
   deps += $(top_builddir)/src/libcharon/libcharon.la
   libs += $(DESTDIR)$(ipseclibdir)/libcharon.so
diff --git a/src/libimcv/Android.mk b/src/libimcv/Android.mk
index 4253fe274..d7ea015bb 100644
--- a/src/libimcv/Android.mk
+++ b/src/libimcv/Android.mk
@@ -41,7 +41,59 @@ libimcv_la_SOURCES := \
 	os_info/os_info.h os_info/os_info.c \
 	pa_tnc/pa_tnc_attr.h \
 	pa_tnc/pa_tnc_msg.h pa_tnc/pa_tnc_msg.c \
-	pa_tnc/pa_tnc_attr_manager.h pa_tnc/pa_tnc_attr_manager.c
+	pa_tnc/pa_tnc_attr_manager.h pa_tnc/pa_tnc_attr_manager.c \
+	pts/pts.h pts/pts.c \
+	pts/pts_error.h pts/pts_error.c \
+	pts/pts_pcr.h pts/pts_pcr.c \
+	pts/pts_proto_caps.h \
+	pts/pts_req_func_comp_evid.h \
+	pts/pts_simple_evid_final.h \
+	pts/pts_creds.h pts/pts_creds.c \
+	pts/pts_database.h pts/pts_database.c \
+	pts/pts_dh_group.h pts/pts_dh_group.c \
+	pts/pts_file_meas.h pts/pts_file_meas.c \
+	pts/pts_file_meta.h pts/pts_file_meta.c \
+	pts/pts_file_type.h pts/pts_file_type.c \
+	pts/pts_ima_bios_list.h pts/pts_ima_bios_list.c \
+	pts/pts_ima_event_list.h pts/pts_ima_event_list.c \
+	pts/pts_meas_algo.h pts/pts_meas_algo.c \
+	pts/components/pts_component.h \
+	pts/components/pts_component_manager.h pts/components/pts_component_manager.c \
+	pts/components/pts_comp_evidence.h pts/components/pts_comp_evidence.c \
+	pts/components/pts_comp_func_name.h pts/components/pts_comp_func_name.c \
+	pts/components/ita/ita_comp_func_name.h pts/components/ita/ita_comp_func_name.c \
+	pts/components/ita/ita_comp_ima.h pts/components/ita/ita_comp_ima.c \
+	pts/components/ita/ita_comp_tboot.h pts/components/ita/ita_comp_tboot.c \
+	pts/components/ita/ita_comp_tgrub.h pts/components/ita/ita_comp_tgrub.c \
+	pts/components/tcg/tcg_comp_func_name.h pts/components/tcg/tcg_comp_func_name.c \
+	seg/seg_contract.h seg/seg_contract.c \
+	seg/seg_contract_manager.h seg/seg_contract_manager.c \
+	seg/seg_env.h seg/seg_env.c \
+	swid/swid_error.h swid/swid_error.c \
+	swid/swid_inventory.h swid/swid_inventory.c \
+	swid/swid_tag.h swid/swid_tag.c \
+	swid/swid_tag_id.h swid/swid_tag_id.c \
+	tcg/tcg_attr.h tcg/tcg_attr.c \
+	tcg/pts/tcg_pts_attr_proto_caps.h tcg/pts/tcg_pts_attr_proto_caps.c \
+	tcg/pts/tcg_pts_attr_dh_nonce_params_req.h tcg/pts/tcg_pts_attr_dh_nonce_params_req.c \
+	tcg/pts/tcg_pts_attr_dh_nonce_params_resp.h tcg/pts/tcg_pts_attr_dh_nonce_params_resp.c \
+	tcg/pts/tcg_pts_attr_dh_nonce_finish.h tcg/pts/tcg_pts_attr_dh_nonce_finish.c \
+	tcg/pts/tcg_pts_attr_meas_algo.h tcg/pts/tcg_pts_attr_meas_algo.c \
+	tcg/pts/tcg_pts_attr_get_tpm_version_info.h tcg/pts/tcg_pts_attr_get_tpm_version_info.c \
+	tcg/pts/tcg_pts_attr_tpm_version_info.h tcg/pts/tcg_pts_attr_tpm_version_info.c \
+	tcg/pts/tcg_pts_attr_get_aik.h tcg/pts/tcg_pts_attr_get_aik.c \
+	tcg/pts/tcg_pts_attr_aik.h tcg/pts/tcg_pts_attr_aik.c \
+	tcg/pts/tcg_pts_attr_req_func_comp_evid.h tcg/pts/tcg_pts_attr_req_func_comp_evid.c \
+	tcg/pts/tcg_pts_attr_gen_attest_evid.h tcg/pts/tcg_pts_attr_gen_attest_evid.c \
+	tcg/pts/tcg_pts_attr_simple_comp_evid.h tcg/pts/tcg_pts_attr_simple_comp_evid.c \
+	tcg/pts/tcg_pts_attr_simple_evid_final.h tcg/pts/tcg_pts_attr_simple_evid_final.c \
+	tcg/pts/tcg_pts_attr_req_file_meas.h tcg/pts/tcg_pts_attr_req_file_meas.c \
+	tcg/pts/tcg_pts_attr_file_meas.h tcg/pts/tcg_pts_attr_file_meas.c \
+	tcg/pts/tcg_pts_attr_req_file_meta.h tcg/pts/tcg_pts_attr_req_file_meta.c \
+	tcg/pts/tcg_pts_attr_unix_file_meta.h tcg/pts/tcg_pts_attr_unix_file_meta.c \
+	tcg/swid/tcg_swid_attr_req.h tcg/swid/tcg_swid_attr_req.c \
+	tcg/swid/tcg_swid_attr_tag_id_inv.h tcg/swid/tcg_swid_attr_tag_id_inv.c \
+	tcg/swid/tcg_swid_attr_tag_inv.h tcg/swid/tcg_swid_attr_tag_inv.c
 
 LOCAL_SRC_FILES := $(filter %.c,$(libimcv_la_SOURCES))
 
diff --git a/src/libimcv/Makefile.am b/src/libimcv/Makefile.am
index 37041d2b2..5102938dc 100644
--- a/src/libimcv/Makefile.am
+++ b/src/libimcv/Makefile.am
@@ -12,6 +12,10 @@ libimcv_la_LIBADD = \
 	$(top_builddir)/src/libstrongswan/libstrongswan.la \
 	$(top_builddir)/src/libtncif/libtncif.la
 
+if USE_TROUSERS
+  libimcv_la_LIBADD += -ltspi
+endif
+
 if USE_WINDOWS
   libimcv_la_LIBADD += -lws2_32
 endif
@@ -56,9 +60,61 @@ libimcv_la_SOURCES = \
 	pa_tnc/pa_tnc_attr.h \
 	pa_tnc/pa_tnc_msg.h pa_tnc/pa_tnc_msg.c \
 	pa_tnc/pa_tnc_attr_manager.h pa_tnc/pa_tnc_attr_manager.c \
+	pts/pts.h pts/pts.c \
+	pts/pts_error.h pts/pts_error.c \
+	pts/pts_pcr.h pts/pts_pcr.c \
+	pts/pts_proto_caps.h \
+	pts/pts_req_func_comp_evid.h \
+	pts/pts_simple_evid_final.h \
+	pts/pts_creds.h pts/pts_creds.c \
+	pts/pts_database.h pts/pts_database.c \
+	pts/pts_dh_group.h pts/pts_dh_group.c \
+	pts/pts_file_meas.h pts/pts_file_meas.c \
+	pts/pts_file_meta.h pts/pts_file_meta.c \
+	pts/pts_file_type.h pts/pts_file_type.c \
+	pts/pts_ima_bios_list.h pts/pts_ima_bios_list.c \
+	pts/pts_ima_event_list.h pts/pts_ima_event_list.c \
+	pts/pts_meas_algo.h pts/pts_meas_algo.c \
+	pts/components/pts_component.h \
+	pts/components/pts_component_manager.h pts/components/pts_component_manager.c \
+	pts/components/pts_comp_evidence.h pts/components/pts_comp_evidence.c \
+	pts/components/pts_comp_func_name.h pts/components/pts_comp_func_name.c \
+	pts/components/ita/ita_comp_func_name.h pts/components/ita/ita_comp_func_name.c \
+	pts/components/ita/ita_comp_ima.h pts/components/ita/ita_comp_ima.c \
+	pts/components/ita/ita_comp_tboot.h pts/components/ita/ita_comp_tboot.c \
+	pts/components/ita/ita_comp_tgrub.h pts/components/ita/ita_comp_tgrub.c \
+	pts/components/tcg/tcg_comp_func_name.h pts/components/tcg/tcg_comp_func_name.c \
 	seg/seg_contract.h seg/seg_contract.c \
 	seg/seg_contract_manager.h seg/seg_contract_manager.c \
-	seg/seg_env.h seg/seg_env.c
+	seg/seg_env.h seg/seg_env.c \
+	swid/swid_error.h swid/swid_error.c \
+	swid/swid_inventory.h swid/swid_inventory.c \
+	swid/swid_tag.h swid/swid_tag.c \
+	swid/swid_tag_id.h swid/swid_tag_id.c \
+	tcg/tcg_attr.h tcg/tcg_attr.c \
+	tcg/pts/tcg_pts_attr_proto_caps.h tcg/pts/tcg_pts_attr_proto_caps.c \
+	tcg/pts/tcg_pts_attr_dh_nonce_params_req.h tcg/pts/tcg_pts_attr_dh_nonce_params_req.c \
+	tcg/pts/tcg_pts_attr_dh_nonce_params_resp.h tcg/pts/tcg_pts_attr_dh_nonce_params_resp.c \
+	tcg/pts/tcg_pts_attr_dh_nonce_finish.h tcg/pts/tcg_pts_attr_dh_nonce_finish.c \
+	tcg/pts/tcg_pts_attr_meas_algo.h tcg/pts/tcg_pts_attr_meas_algo.c \
+	tcg/pts/tcg_pts_attr_get_tpm_version_info.h tcg/pts/tcg_pts_attr_get_tpm_version_info.c \
+	tcg/pts/tcg_pts_attr_tpm_version_info.h tcg/pts/tcg_pts_attr_tpm_version_info.c \
+	tcg/pts/tcg_pts_attr_get_aik.h tcg/pts/tcg_pts_attr_get_aik.c \
+	tcg/pts/tcg_pts_attr_aik.h tcg/pts/tcg_pts_attr_aik.c \
+	tcg/pts/tcg_pts_attr_req_func_comp_evid.h tcg/pts/tcg_pts_attr_req_func_comp_evid.c \
+	tcg/pts/tcg_pts_attr_gen_attest_evid.h tcg/pts/tcg_pts_attr_gen_attest_evid.c \
+	tcg/pts/tcg_pts_attr_simple_comp_evid.h tcg/pts/tcg_pts_attr_simple_comp_evid.c \
+	tcg/pts/tcg_pts_attr_simple_evid_final.h tcg/pts/tcg_pts_attr_simple_evid_final.c \
+	tcg/pts/tcg_pts_attr_req_file_meas.h tcg/pts/tcg_pts_attr_req_file_meas.c \
+	tcg/pts/tcg_pts_attr_file_meas.h tcg/pts/tcg_pts_attr_file_meas.c \
+	tcg/pts/tcg_pts_attr_req_file_meta.h tcg/pts/tcg_pts_attr_req_file_meta.c \
+	tcg/pts/tcg_pts_attr_unix_file_meta.h tcg/pts/tcg_pts_attr_unix_file_meta.c \
+	tcg/seg/tcg_seg_attr_max_size.h tcg/seg/tcg_seg_attr_max_size.c \
+	tcg/seg/tcg_seg_attr_seg_env.h tcg/seg/tcg_seg_attr_seg_env.c \
+	tcg/seg/tcg_seg_attr_next_seg.h tcg/seg/tcg_seg_attr_next_seg.c \
+	tcg/swid/tcg_swid_attr_req.h tcg/swid/tcg_swid_attr_req.c \
+	tcg/swid/tcg_swid_attr_tag_id_inv.h tcg/swid/tcg_swid_attr_tag_id_inv.c \
+	tcg/swid/tcg_swid_attr_tag_inv.h tcg/swid/tcg_swid_attr_tag_inv.c
 
 ipsec_SCRIPTS = imv/_imv_policy
 EXTRA_DIST = imv/_imv_policy Android.mk
@@ -99,3 +155,19 @@ endif
 if USE_IMV_OS
   SUBDIRS += plugins/imv_os
 endif
+
+if USE_IMC_ATTESTATION
+  SUBDIRS += plugins/imc_attestation
+endif
+
+if USE_IMV_ATTESTATION
+  SUBDIRS += plugins/imv_attestation
+endif
+
+if USE_IMC_SWID
+  SUBDIRS += plugins/imc_swid
+endif
+
+if USE_IMV_SWID
+  SUBDIRS += plugins/imv_swid
+endif
diff --git a/src/libimcv/imc/imc_msg.c b/src/libimcv/imc/imc_msg.c
index ce628e4fe..810a92a93 100644
--- a/src/libimcv/imc/imc_msg.c
+++ b/src/libimcv/imc/imc_msg.c
@@ -18,14 +18,13 @@
 #include "ietf/ietf_attr.h"
 #include "ietf/ietf_attr_assess_result.h"
 #include "ietf/ietf_attr_remediation_instr.h"
+#include "tcg/seg/tcg_seg_attr_max_size.h"
+#include "tcg/seg/tcg_seg_attr_seg_env.h"
+#include "tcg/seg/tcg_seg_attr_next_seg.h"
 
 #include <tncif_names.h>
 #include <tncif_pa_subtypes.h>
 
-#include <tcg/seg/tcg_seg_attr_max_size.h>
-#include <tcg/seg/tcg_seg_attr_seg_env.h>
-#include <tcg/seg/tcg_seg_attr_next_seg.h>
-
 #include <pen/pen.h>
 #include <collections/linked_list.h>
 #include <utils/debug.h>
diff --git a/src/libimcv/imcv.c b/src/libimcv/imcv.c
index 30679a33d..703da2306 100644
--- a/src/libimcv/imcv.c
+++ b/src/libimcv/imcv.c
@@ -15,6 +15,14 @@
 #include "imcv.h"
 #include "ietf/ietf_attr.h"
 #include "ita/ita_attr.h"
+#include "tcg/tcg_attr.h"
+#include "pts/components/pts_component.h"
+#include "pts/components/pts_component_manager.h"
+#include "pts/components/tcg/tcg_comp_func_name.h"
+#include "pts/components/ita/ita_comp_func_name.h"
+#include "pts/components/ita/ita_comp_ima.h"
+#include "pts/components/ita/ita_comp_tboot.h"
+#include "pts/components/ita/ita_comp_tgrub.h"
 
 #include <utils/debug.h>
 #include <utils/utils.h>
@@ -44,6 +52,11 @@ imv_session_manager_t *imcv_sessions;
 imv_database_t *imcv_db;
 
 /**
+ * PTS Functional Component manager
+ */
+pts_component_manager_t *imcv_pts_components;
+
+/**
  * Reference count for libimcv
  */
 static refcount_t libimcv_ref = 0;
@@ -162,7 +175,26 @@ bool libimcv_init(bool is_imv)
 							ietf_attr_create_from_data, ietf_attr_names);
 		imcv_pa_tnc_attributes->add_vendor(imcv_pa_tnc_attributes, PEN_ITA,
 							ita_attr_create_from_data, ita_attr_names);
-
+		imcv_pa_tnc_attributes->add_vendor(imcv_pa_tnc_attributes, PEN_TCG,
+							tcg_attr_create_from_data, tcg_attr_names);
+
+		imcv_pts_components = pts_component_manager_create();
+		imcv_pts_components->add_vendor(imcv_pts_components, PEN_TCG,
+					pts_tcg_comp_func_names, PTS_TCG_QUALIFIER_TYPE_SIZE,
+					pts_tcg_qualifier_flag_names, pts_tcg_qualifier_type_names);
+		imcv_pts_components->add_vendor(imcv_pts_components, PEN_ITA,
+					pts_ita_comp_func_names, PTS_ITA_QUALIFIER_TYPE_SIZE,
+					pts_ita_qualifier_flag_names, pts_ita_qualifier_type_names);
+
+		imcv_pts_components->add_component(imcv_pts_components, PEN_ITA,
+									  PTS_ITA_COMP_FUNC_NAME_TGRUB,
+									  pts_ita_comp_tgrub_create);
+		imcv_pts_components->add_component(imcv_pts_components, PEN_ITA,
+									  PTS_ITA_COMP_FUNC_NAME_TBOOT,
+									  pts_ita_comp_tboot_create);
+		imcv_pts_components->add_component(imcv_pts_components, PEN_ITA,
+									  PTS_ITA_COMP_FUNC_NAME_IMA,
+									  pts_ita_comp_ima_create);
 		if (is_imv)
 		{
 			/* instantiate global IMV session manager */
@@ -193,8 +225,13 @@ void libimcv_deinit(void)
 {
 	if (ref_put(&libimcv_ref))
 	{
+		imcv_pts_components->remove_vendor(imcv_pts_components, PEN_TCG);
+		imcv_pts_components->remove_vendor(imcv_pts_components, PEN_ITA);
+		imcv_pts_components->destroy(imcv_pts_components);
+
 		imcv_pa_tnc_attributes->remove_vendor(imcv_pa_tnc_attributes, PEN_IETF);
 		imcv_pa_tnc_attributes->remove_vendor(imcv_pa_tnc_attributes, PEN_ITA);
+		imcv_pa_tnc_attributes->remove_vendor(imcv_pa_tnc_attributes, PEN_TCG);
 		DESTROY_IF(imcv_pa_tnc_attributes);
 		imcv_pa_tnc_attributes = NULL;
 		DESTROY_IF(imcv_db);
diff --git a/src/libimcv/imcv.h b/src/libimcv/imcv.h
index 771038803..cfb1903d9 100644
--- a/src/libimcv/imcv.h
+++ b/src/libimcv/imcv.h
@@ -37,6 +37,7 @@
 #include "pa_tnc/pa_tnc_attr_manager.h"
 #include "imv/imv_database.h"
 #include "imv/imv_session_manager.h"
+#include "pts/components/pts_component_manager.h"
 
 #include <library.h>
 
@@ -68,4 +69,9 @@ extern imv_database_t* imcv_db;
  */
 extern imv_session_manager_t* imcv_sessions;
 
+/**
+ * PTS Functional Component manager
+ */
+extern pts_component_manager_t* imcv_pts_components;
+
 #endif /** IMCV_H_ @}*/
diff --git a/src/libimcv/imv/imv_msg.c b/src/libimcv/imv/imv_msg.c
index d5f86ba88..6c4b998a2 100644
--- a/src/libimcv/imv/imv_msg.c
+++ b/src/libimcv/imv/imv_msg.c
@@ -18,14 +18,13 @@
 #include "ietf/ietf_attr.h"
 #include "ietf/ietf_attr_assess_result.h"
 #include "ietf/ietf_attr_remediation_instr.h"
+#include "tcg/seg/tcg_seg_attr_max_size.h"
+#include "tcg/seg/tcg_seg_attr_seg_env.h"
+#include "tcg/seg/tcg_seg_attr_next_seg.h"
 
 #include <tncif_names.h>
 #include <tncif_pa_subtypes.h>
 
-#include <tcg/seg/tcg_seg_attr_max_size.h>
-#include <tcg/seg/tcg_seg_attr_seg_env.h>
-#include <tcg/seg/tcg_seg_attr_next_seg.h>
-
 #include <pen/pen.h>
 #include <collections/linked_list.h>
 #include <utils/debug.h>
diff --git a/src/libpts/plugins/imc_attestation/Makefile.am b/src/libimcv/plugins/imc_attestation/Makefile.am
index 88d9ddd8b..e7b1f1ce1 100644
--- a/src/libpts/plugins/imc_attestation/Makefile.am
+++ b/src/libimcv/plugins/imc_attestation/Makefile.am
@@ -1,8 +1,7 @@
 AM_CPPFLAGS = \
 	-I$(top_srcdir)/src/libstrongswan \
 	-I$(top_srcdir)/src/libtncif \
-	-I$(top_srcdir)/src/libimcv \
-	-I$(top_srcdir)/src/libpts
+	-I$(top_srcdir)/src/libimcv
 
 AM_CFLAGS = \
 	$(PLUGIN_CFLAGS)
@@ -10,8 +9,7 @@ AM_CFLAGS = \
 imcv_LTLIBRARIES = imc-attestation.la
 
 imc_attestation_la_LIBADD = $(top_builddir)/src/libimcv/libimcv.la \
-	$(top_builddir)/src/libstrongswan/libstrongswan.la \
-	$(top_builddir)/src/libpts/libpts.la
+	$(top_builddir)/src/libstrongswan/libstrongswan.la
 
 imc_attestation_la_SOURCES = imc_attestation.c \
 	imc_attestation_state.h imc_attestation_state.c \
diff --git a/src/libpts/plugins/imc_attestation/imc_attestation.c b/src/libimcv/plugins/imc_attestation/imc_attestation.c
index f7652f3a3..0dd88b6a7 100644
--- a/src/libpts/plugins/imc_attestation/imc_attestation.c
+++ b/src/libimcv/plugins/imc_attestation/imc_attestation.c
@@ -1,5 +1,6 @@
 /*
- * Copyright (C) 2011-2012 Sansar Choinyambuu, Andreas Steffen
+ * Copyright (C) 2011-2012 Sansar Choinyambuu
+ * Copyright (C) 2011-2014 Andreas Steffen
  * HSR Hochschule fuer Technik Rapperswil
  *
  * This program is free software; you can redistribute it and/or modify it
@@ -23,14 +24,10 @@
 #include <ietf/ietf_attr_product_info.h>
 #include <ietf/ietf_attr_string_version.h>
 #include <ietf/ietf_attr_assess_result.h>
-#include <os_info/os_info.h>
-
-#include <libpts.h>
-
-#include <pts/pts_error.h>
-
 #include <tcg/pts/tcg_pts_attr_proto_caps.h>
 #include <tcg/pts/tcg_pts_attr_meas_algo.h>
+#include <os_info/os_info.h>
+#include <pts/pts_error.h>
 
 #include <tncif_pa_subtypes.h>
 
@@ -90,7 +87,6 @@ TNC_Result TNC_IMC_API TNC_IMC_Initialize(TNC_IMCID imc_id,
 		imc_attestation = NULL;
 		return TNC_RESULT_FATAL;
 	}
-	libpts_init();
 
 	if (min_version > TNC_IFIMC_VERSION_1 || max_version < TNC_IFIMC_VERSION_1)
 	{
@@ -318,9 +314,6 @@ TNC_Result TNC_IMC_API TNC_IMC_Terminate(TNC_IMCID imc_id)
 		DBG1(DBG_IMC, "IMC \"%s\" has not been initialized", imc_name);
 		return TNC_RESULT_NOT_INITIALIZED;
 	}
-
-	libpts_deinit();
-
 	imc_attestation->destroy(imc_attestation);
 	imc_attestation = NULL;
 
diff --git a/src/libpts/plugins/imc_attestation/imc_attestation_process.c b/src/libimcv/plugins/imc_attestation/imc_attestation_process.c
index fbe81ee48..fbe81ee48 100644
--- a/src/libpts/plugins/imc_attestation/imc_attestation_process.c
+++ b/src/libimcv/plugins/imc_attestation/imc_attestation_process.c
diff --git a/src/libpts/plugins/imc_attestation/imc_attestation_process.h b/src/libimcv/plugins/imc_attestation/imc_attestation_process.h
index a2f1b4e3c..a2f1b4e3c 100644
--- a/src/libpts/plugins/imc_attestation/imc_attestation_process.h
+++ b/src/libimcv/plugins/imc_attestation/imc_attestation_process.h
diff --git a/src/libpts/plugins/imc_attestation/imc_attestation_state.c b/src/libimcv/plugins/imc_attestation/imc_attestation_state.c
index ea6742f6a..0b594cb10 100644
--- a/src/libpts/plugins/imc_attestation/imc_attestation_state.c
+++ b/src/libimcv/plugins/imc_attestation/imc_attestation_state.c
@@ -16,7 +16,7 @@
 
 #include "imc_attestation_state.h"
 
-#include <libpts.h>
+#include <imcv.h>
 
 #include <tncif_names.h>
 
@@ -194,7 +194,8 @@ METHOD(imc_attestation_state_t, create_component, pts_component_t*,
 
 	if (!found)
 	{
-		component = pts_components->create(pts_components, name, depth, NULL);
+		component = imcv_pts_components->create(imcv_pts_components,
+												name, depth, NULL);
 		if (!component)
 		{
 			return NULL;
diff --git a/src/libpts/plugins/imc_attestation/imc_attestation_state.h b/src/libimcv/plugins/imc_attestation/imc_attestation_state.h
index 4b93931c3..854c8825b 100644
--- a/src/libpts/plugins/imc_attestation/imc_attestation_state.h
+++ b/src/libimcv/plugins/imc_attestation/imc_attestation_state.h
@@ -15,7 +15,7 @@
 
 /**
  * @defgroup imc_attestation imc_attestation
- * @ingroup libpts_plugins
+ * @ingroup libimcv_plugins
  *
  * @defgroup imc_attestation_state_t imc_attestation_state
  * @{ @ingroup imc_attestation
diff --git a/src/libpts/plugins/imc_swid/.gitignore b/src/libimcv/plugins/imc_swid/.gitignore
index 448ad2f2a..448ad2f2a 100644
--- a/src/libpts/plugins/imc_swid/.gitignore
+++ b/src/libimcv/plugins/imc_swid/.gitignore
diff --git a/src/libpts/plugins/imc_swid/Makefile.am b/src/libimcv/plugins/imc_swid/Makefile.am
index ddf596465..c1cdb988a 100644
--- a/src/libpts/plugins/imc_swid/Makefile.am
+++ b/src/libimcv/plugins/imc_swid/Makefile.am
@@ -21,7 +21,6 @@ AM_CPPFLAGS = \
 	-I$(top_srcdir)/src/libstrongswan \
 	-I$(top_srcdir)/src/libtncif \
 	-I$(top_srcdir)/src/libimcv \
-	-I$(top_srcdir)/src/libpts \
 	-DSWID_DIRECTORY=\"${prefix}/share\"
 
 AM_CFLAGS = \
@@ -31,7 +30,6 @@ imcv_LTLIBRARIES = imc-swid.la
 
 imc_swid_la_LIBADD = \
 	$(top_builddir)/src/libimcv/libimcv.la \
-	$(top_builddir)/src/libpts/libpts.la \
 	$(top_builddir)/src/libstrongswan/libstrongswan.la
 
 imc_swid_la_SOURCES = imc_swid.c imc_swid_state.h imc_swid_state.c
diff --git a/src/libpts/plugins/imc_swid/imc_swid.c b/src/libimcv/plugins/imc_swid/imc_swid.c
index 3763731a0..86e2693d5 100644
--- a/src/libpts/plugins/imc_swid/imc_swid.c
+++ b/src/libimcv/plugins/imc_swid/imc_swid.c
@@ -15,17 +15,15 @@
 
 #include "imc_swid_state.h"
 
-#include "libpts.h"
-#include "swid/swid_inventory.h"
-#include "swid/swid_error.h"
-#include "tcg/swid/tcg_swid_attr_req.h"
-#include "tcg/swid/tcg_swid_attr_tag_inv.h"
-#include "tcg/swid/tcg_swid_attr_tag_id_inv.h"
-
 #include <imc/imc_agent.h>
 #include <imc/imc_msg.h>
 #include <ita/ita_attr.h>
 #include <ita/ita_attr_angel.h>
+#include "tcg/swid/tcg_swid_attr_req.h"
+#include "tcg/swid/tcg_swid_attr_tag_inv.h"
+#include "tcg/swid/tcg_swid_attr_tag_id_inv.h"
+#include "swid/swid_inventory.h"
+#include "swid/swid_error.h"
 
 #include <tncif_pa_subtypes.h>
 
@@ -63,9 +61,6 @@ TNC_Result TNC_IMC_Initialize(TNC_IMCID imc_id,
 	{
 		return TNC_RESULT_FATAL;
 	}
-
-	libpts_init();
-
 	if (min_version > TNC_IFIMC_VERSION_1 || max_version < TNC_IFIMC_VERSION_1)
 	{
 		DBG1(DBG_IMC, "no common IF-IMC version");
@@ -431,9 +426,6 @@ TNC_Result TNC_IMC_Terminate(TNC_IMCID imc_id)
 		DBG1(DBG_IMC, "IMC \"%s\" has not been initialized", imc_name);
 		return TNC_RESULT_NOT_INITIALIZED;
 	}
-
-	libpts_deinit();
-
 	imc_swid->destroy(imc_swid);
 	imc_swid = NULL;
 
diff --git a/src/libpts/plugins/imc_swid/imc_swid_state.c b/src/libimcv/plugins/imc_swid/imc_swid_state.c
index 65c279b3f..65c279b3f 100644
--- a/src/libpts/plugins/imc_swid/imc_swid_state.c
+++ b/src/libimcv/plugins/imc_swid/imc_swid_state.c
diff --git a/src/libpts/plugins/imc_swid/imc_swid_state.h b/src/libimcv/plugins/imc_swid/imc_swid_state.h
index cb3ac4589..cb3ac4589 100644
--- a/src/libpts/plugins/imc_swid/imc_swid_state.h
+++ b/src/libimcv/plugins/imc_swid/imc_swid_state.h
diff --git a/src/libpts/plugins/imc_swid/regid.1999-03.org.debian/regid.1999-03.org.debian_apache-2-2-22-13.swidtag b/src/libimcv/plugins/imc_swid/regid.1999-03.org.debian/regid.1999-03.org.debian_apache-2-2-22-13.swidtag
index 82e16d2d0..82e16d2d0 100644
--- a/src/libpts/plugins/imc_swid/regid.1999-03.org.debian/regid.1999-03.org.debian_apache-2-2-22-13.swidtag
+++ b/src/libimcv/plugins/imc_swid/regid.1999-03.org.debian/regid.1999-03.org.debian_apache-2-2-22-13.swidtag
diff --git a/src/libpts/plugins/imc_swid/regid.1999-03.org.debian/regid.1999-03.org.debian_bind-9-8-4-dfsg.swidtag b/src/libimcv/plugins/imc_swid/regid.1999-03.org.debian/regid.1999-03.org.debian_bind-9-8-4-dfsg.swidtag
index 9e856eb24..9e856eb24 100644
--- a/src/libpts/plugins/imc_swid/regid.1999-03.org.debian/regid.1999-03.org.debian_bind-9-8-4-dfsg.swidtag
+++ b/src/libimcv/plugins/imc_swid/regid.1999-03.org.debian/regid.1999-03.org.debian_bind-9-8-4-dfsg.swidtag
diff --git a/src/libpts/plugins/imc_swid/regid.1999-03.org.debian/regid.1999-03.org.debian_libsqlite-3-7-13-1.swidtag b/src/libimcv/plugins/imc_swid/regid.1999-03.org.debian/regid.1999-03.org.debian_libsqlite-3-7-13-1.swidtag
index 765026326..765026326 100644
--- a/src/libpts/plugins/imc_swid/regid.1999-03.org.debian/regid.1999-03.org.debian_libsqlite-3-7-13-1.swidtag
+++ b/src/libimcv/plugins/imc_swid/regid.1999-03.org.debian/regid.1999-03.org.debian_libsqlite-3-7-13-1.swidtag
diff --git a/src/libpts/plugins/imc_swid/regid.1999-03.org.debian/regid.1999-03.org.debian_libssl-1-0-1e-2.swidtag b/src/libimcv/plugins/imc_swid/regid.1999-03.org.debian/regid.1999-03.org.debian_libssl-1-0-1e-2.swidtag
index 5a31c572b..5a31c572b 100644
--- a/src/libpts/plugins/imc_swid/regid.1999-03.org.debian/regid.1999-03.org.debian_libssl-1-0-1e-2.swidtag
+++ b/src/libimcv/plugins/imc_swid/regid.1999-03.org.debian/regid.1999-03.org.debian_libssl-1-0-1e-2.swidtag
diff --git a/src/libpts/plugins/imc_swid/regid.1999-03.org.debian/regid.1999-03.org.debian_libssl-dev-1-0-1e-2.swidtag b/src/libimcv/plugins/imc_swid/regid.1999-03.org.debian/regid.1999-03.org.debian_libssl-dev-1-0-1e-2.swidtag
index cc6888b8d..cc6888b8d 100644
--- a/src/libpts/plugins/imc_swid/regid.1999-03.org.debian/regid.1999-03.org.debian_libssl-dev-1-0-1e-2.swidtag
+++ b/src/libimcv/plugins/imc_swid/regid.1999-03.org.debian/regid.1999-03.org.debian_libssl-dev-1-0-1e-2.swidtag
diff --git a/src/libpts/plugins/imc_swid/regid.1999-03.org.debian/regid.1999-03.org.debian_openssl-1-0-1e-2.swidtag b/src/libimcv/plugins/imc_swid/regid.1999-03.org.debian/regid.1999-03.org.debian_openssl-1-0-1e-2.swidtag
index af0a60d9e..af0a60d9e 100644
--- a/src/libpts/plugins/imc_swid/regid.1999-03.org.debian/regid.1999-03.org.debian_openssl-1-0-1e-2.swidtag
+++ b/src/libimcv/plugins/imc_swid/regid.1999-03.org.debian/regid.1999-03.org.debian_openssl-1-0-1e-2.swidtag
diff --git a/src/libpts/plugins/imc_swid/regid.1999-03.org.debian/regid.1999-03.org.debian_sqlite-3-7-13-1.swidtag b/src/libimcv/plugins/imc_swid/regid.1999-03.org.debian/regid.1999-03.org.debian_sqlite-3-7-13-1.swidtag
index 43d0fdce3..43d0fdce3 100644
--- a/src/libpts/plugins/imc_swid/regid.1999-03.org.debian/regid.1999-03.org.debian_sqlite-3-7-13-1.swidtag
+++ b/src/libimcv/plugins/imc_swid/regid.1999-03.org.debian/regid.1999-03.org.debian_sqlite-3-7-13-1.swidtag
diff --git a/src/libpts/plugins/imc_swid/regid.2004-03.org.strongswan_strongSwan.swidtag.in b/src/libimcv/plugins/imc_swid/regid.2004-03.org.strongswan_strongSwan.swidtag.in
index 8b7b50fdf..8b7b50fdf 100644
--- a/src/libpts/plugins/imc_swid/regid.2004-03.org.strongswan_strongSwan.swidtag.in
+++ b/src/libimcv/plugins/imc_swid/regid.2004-03.org.strongswan_strongSwan.swidtag.in
diff --git a/src/libpts/plugins/imv_attestation/.gitignore b/src/libimcv/plugins/imv_attestation/.gitignore
index 79548ebac..79548ebac 100644
--- a/src/libpts/plugins/imv_attestation/.gitignore
+++ b/src/libimcv/plugins/imv_attestation/.gitignore
diff --git a/src/libpts/plugins/imv_attestation/Makefile.am b/src/libimcv/plugins/imv_attestation/Makefile.am
index 8dc74fd54..6c5bf8913 100644
--- a/src/libpts/plugins/imv_attestation/Makefile.am
+++ b/src/libimcv/plugins/imv_attestation/Makefile.am
@@ -2,7 +2,6 @@ AM_CPPFLAGS = \
 	-I$(top_srcdir)/src/libstrongswan \
 	-I$(top_srcdir)/src/libtncif \
 	-I$(top_srcdir)/src/libimcv \
-	-I$(top_srcdir)/src/libpts \
 	-DPLUGINS=\""${attest_plugins}\""
 
 AM_CFLAGS = \
@@ -12,8 +11,7 @@ imcv_LTLIBRARIES = imv-attestation.la
 
 imv_attestation_la_LIBADD = \
 	$(top_builddir)/src/libimcv/libimcv.la \
-	$(top_builddir)/src/libstrongswan/libstrongswan.la \
-	$(top_builddir)/src/libpts/libpts.la
+	$(top_builddir)/src/libstrongswan/libstrongswan.la
 
 imv_attestation_la_SOURCES = imv_attestation.c \
 	imv_attestation_state.h imv_attestation_state.c \
@@ -29,7 +27,6 @@ attest_SOURCES = attest.c \
 	attest_db.h attest_db.c
 attest_LDADD = \
 	$(top_builddir)/src/libimcv/libimcv.la \
-	$(top_builddir)/src/libpts/libpts.la \
 	$(top_builddir)/src/libstrongswan/libstrongswan.la
 attest.o :	$(top_builddir)/config.status
 
diff --git a/src/libpts/plugins/imv_attestation/attest.c b/src/libimcv/plugins/imv_attestation/attest.c
index 63c0023a7..1143a0356 100644
--- a/src/libpts/plugins/imv_attestation/attest.c
+++ b/src/libimcv/plugins/imv_attestation/attest.c
@@ -28,7 +28,6 @@
 #include <utils/debug.h>
 
 #include <imcv.h>
-#include <libpts.h>
 #include <pts/pts_meas_algo.h>
 
 #include "attest_db.h"
@@ -96,7 +95,6 @@ attest_db_t *attest;
 static void cleanup(void)
 {
 	attest->destroy(attest);
-	libpts_deinit();
 	libimcv_deinit();
 #ifdef HAVE_SYSLOG
 	closelog();
@@ -479,7 +477,6 @@ int main(int argc, char *argv[])
 	}
 	atexit(cleanup);
 	libimcv_init(FALSE);
-	libpts_init();
 
 	do_args(argc, argv);
 
diff --git a/src/libpts/plugins/imv_attestation/attest_db.c b/src/libimcv/plugins/imv_attestation/attest_db.c
index d7f45ad29..f85a02b3d 100644
--- a/src/libpts/plugins/imv_attestation/attest_db.c
+++ b/src/libimcv/plugins/imv_attestation/attest_db.c
@@ -23,7 +23,7 @@
 
 #include "attest_db.h"
 
-#include "libpts.h"
+#include "imcv.h"
 #include "pts/pts_meas_algo.h"
 #include "pts/pts_file_meas.h"
 #include "pts/components/pts_comp_func_name.h"
@@ -187,9 +187,10 @@ char* print_cfn(pts_comp_func_name_t *cfn)
 	qualifier = cfn->get_qualifier(cfn);
 	n = snprintf(buf, BUF_LEN, "0x%06x/0x%08x-0x%02x", vid, name, qualifier);
 
-	names = pts_components->get_comp_func_names(pts_components, vid);
-	types = pts_components->get_qualifier_type_names(pts_components, vid);
-	type =  pts_components->get_qualifier(pts_components, cfn, flags);
+	names = imcv_pts_components->get_comp_func_names(imcv_pts_components, vid);
+	types = imcv_pts_components->get_qualifier_type_names(imcv_pts_components,
+														  vid);
+	type =  imcv_pts_components->get_qualifier(imcv_pts_components, cfn, flags);
 	if (names && types)
 	{
 		n = snprintf(buf + n, BUF_LEN - n, " %N/%N [%s] %N",
diff --git a/src/libpts/plugins/imv_attestation/attest_db.h b/src/libimcv/plugins/imv_attestation/attest_db.h
index 07e55cce7..07e55cce7 100644
--- a/src/libpts/plugins/imv_attestation/attest_db.h
+++ b/src/libimcv/plugins/imv_attestation/attest_db.h
diff --git a/src/libpts/plugins/imv_attestation/attest_usage.c b/src/libimcv/plugins/imv_attestation/attest_usage.c
index 8f4afdbad..8f4afdbad 100644
--- a/src/libpts/plugins/imv_attestation/attest_usage.c
+++ b/src/libimcv/plugins/imv_attestation/attest_usage.c
diff --git a/src/libpts/plugins/imv_attestation/attest_usage.h b/src/libimcv/plugins/imv_attestation/attest_usage.h
index bce801e9d..bce801e9d 100644
--- a/src/libpts/plugins/imv_attestation/attest_usage.h
+++ b/src/libimcv/plugins/imv_attestation/attest_usage.h
diff --git a/src/libpts/plugins/imv_attestation/build-database.sh b/src/libimcv/plugins/imv_attestation/build-database.sh
index 980de47ff..980de47ff 100755
--- a/src/libpts/plugins/imv_attestation/build-database.sh
+++ b/src/libimcv/plugins/imv_attestation/build-database.sh
diff --git a/src/libpts/plugins/imv_attestation/imv_attestation.c b/src/libimcv/plugins/imv_attestation/imv_attestation.c
index 542a561aa..542a561aa 100644
--- a/src/libpts/plugins/imv_attestation/imv_attestation.c
+++ b/src/libimcv/plugins/imv_attestation/imv_attestation.c
diff --git a/src/libpts/plugins/imv_attestation/imv_attestation_agent.c b/src/libimcv/plugins/imv_attestation/imv_attestation_agent.c
index ead3cc8e4..c265e853c 100644
--- a/src/libpts/plugins/imv_attestation/imv_attestation_agent.c
+++ b/src/libimcv/plugins/imv_attestation/imv_attestation_agent.c
@@ -34,19 +34,15 @@
 #include <ietf/ietf_attr_string_version.h>
 #include <ita/ita_attr.h>
 #include <ita/ita_attr_device_id.h>
-
-#include <libpts.h>
-
-#include <pts/pts.h>
-#include <pts/pts_database.h>
-#include <pts/pts_creds.h>
-#include <pts/components/ita/ita_comp_func_name.h>
-
 #include <tcg/tcg_attr.h>
 #include <tcg/pts/tcg_pts_attr_meas_algo.h>
 #include <tcg/pts/tcg_pts_attr_proto_caps.h>
 #include <tcg/pts/tcg_pts_attr_req_file_meas.h>
 #include <tcg/pts/tcg_pts_attr_req_file_meta.h>
+#include <pts/pts.h>
+#include <pts/pts_database.h>
+#include <pts/pts_creds.h>
+#include <pts/components/ita/ita_comp_func_name.h>
 
 #include <tncif_pa_subtypes.h>
 
@@ -842,7 +838,6 @@ METHOD(imv_agent_if_t, destroy, void,
 	DESTROY_IF(this->pts_credmgr);
 	DESTROY_IF(this->agent);
 	free(this);
-	libpts_deinit();
 }
 
 /**
@@ -890,8 +885,6 @@ imv_agent_if_t *imv_attestation_agent_create(const char *name, TNC_IMVID id,
 		.pts_db = pts_database_create(imcv_db),
 	);
 
-	libpts_init();
-
 	if (!pts_meas_algo_probe(&this->supported_algorithms) ||
 		!pts_dh_group_probe(&this->supported_dh_groups, mandatory_dh_groups) ||
 		!pts_meas_algo_update(hash_alg, &this->supported_algorithms) ||
diff --git a/src/libpts/plugins/imv_attestation/imv_attestation_agent.h b/src/libimcv/plugins/imv_attestation/imv_attestation_agent.h
index cc421a29a..cc421a29a 100644
--- a/src/libpts/plugins/imv_attestation/imv_attestation_agent.h
+++ b/src/libimcv/plugins/imv_attestation/imv_attestation_agent.h
diff --git a/src/libpts/plugins/imv_attestation/imv_attestation_build.c b/src/libimcv/plugins/imv_attestation/imv_attestation_build.c
index 120fe3eaa..120fe3eaa 100644
--- a/src/libpts/plugins/imv_attestation/imv_attestation_build.c
+++ b/src/libimcv/plugins/imv_attestation/imv_attestation_build.c
diff --git a/src/libpts/plugins/imv_attestation/imv_attestation_build.h b/src/libimcv/plugins/imv_attestation/imv_attestation_build.h
index 88538b198..88538b198 100644
--- a/src/libpts/plugins/imv_attestation/imv_attestation_build.h
+++ b/src/libimcv/plugins/imv_attestation/imv_attestation_build.h
diff --git a/src/libpts/plugins/imv_attestation/imv_attestation_process.c b/src/libimcv/plugins/imv_attestation/imv_attestation_process.c
index 26a57d15c..26a57d15c 100644
--- a/src/libpts/plugins/imv_attestation/imv_attestation_process.c
+++ b/src/libimcv/plugins/imv_attestation/imv_attestation_process.c
diff --git a/src/libpts/plugins/imv_attestation/imv_attestation_process.h b/src/libimcv/plugins/imv_attestation/imv_attestation_process.h
index af8666b66..af8666b66 100644
--- a/src/libpts/plugins/imv_attestation/imv_attestation_process.h
+++ b/src/libimcv/plugins/imv_attestation/imv_attestation_process.h
diff --git a/src/libpts/plugins/imv_attestation/imv_attestation_state.c b/src/libimcv/plugins/imv_attestation/imv_attestation_state.c
index feccb6d28..1c3b91aeb 100644
--- a/src/libpts/plugins/imv_attestation/imv_attestation_state.c
+++ b/src/libimcv/plugins/imv_attestation/imv_attestation_state.c
@@ -16,8 +16,7 @@
 
 #include "imv_attestation_state.h"
 
-#include <libpts.h>
-
+#include <imcv.h>
 #include <imv/imv_lang_string.h>
 #include "imv/imv_reason_string.h"
 
@@ -404,7 +403,8 @@ METHOD(imv_attestation_state_t, create_component, pts_component_t*,
 	}
 	else
 	{
-		component = pts_components->create(pts_components, name, depth, pts_db);
+		component = imcv_pts_components->create(imcv_pts_components,
+												name, depth, pts_db);
 		if (!component)
 		{
 			/* unsupported component */
diff --git a/src/libpts/plugins/imv_attestation/imv_attestation_state.h b/src/libimcv/plugins/imv_attestation/imv_attestation_state.h
index b72857552..5e6fae2ca 100644
--- a/src/libpts/plugins/imv_attestation/imv_attestation_state.h
+++ b/src/libimcv/plugins/imv_attestation/imv_attestation_state.h
@@ -15,7 +15,7 @@
 
 /**
  * @defgroup imv_attestation imv_attestation
- * @ingroup libpts_plugins
+ * @ingroup libimcv_plugins
  *
  * @defgroup imv_attestation_state_t imv_attestation_state
  * @{ @ingroup imv_attestation
diff --git a/src/libpts/plugins/imv_swid/Makefile.am b/src/libimcv/plugins/imv_swid/Makefile.am
index 9305484c2..3a63b67d2 100644
--- a/src/libpts/plugins/imv_swid/Makefile.am
+++ b/src/libimcv/plugins/imv_swid/Makefile.am
@@ -1,8 +1,7 @@
 AM_CPPFLAGS = \
 	-I$(top_srcdir)/src/libstrongswan \
 	-I$(top_srcdir)/src/libtncif \
-	-I$(top_srcdir)/src/libimcv \
-	-I$(top_srcdir)/src/libpts
+	-I$(top_srcdir)/src/libimcv
 
 AM_CFLAGS = \
 	$(PLUGIN_CFLAGS) $(json_CFLAGS)
@@ -11,7 +10,6 @@ imcv_LTLIBRARIES = imv-swid.la
 
 imv_swid_la_LIBADD = \
 	$(top_builddir)/src/libimcv/libimcv.la \
-	$(top_builddir)/src/libpts/libpts.la \
 	$(top_builddir)/src/libstrongswan/libstrongswan.la \
 	$(json_LIBS)
 
diff --git a/src/libpts/plugins/imv_swid/imv_swid.c b/src/libimcv/plugins/imv_swid/imv_swid.c
index cab011580..cab011580 100644
--- a/src/libpts/plugins/imv_swid/imv_swid.c
+++ b/src/libimcv/plugins/imv_swid/imv_swid.c
diff --git a/src/libpts/plugins/imv_swid/imv_swid_agent.c b/src/libimcv/plugins/imv_swid/imv_swid_agent.c
index 71c601c84..724611de8 100644
--- a/src/libpts/plugins/imv_swid/imv_swid_agent.c
+++ b/src/libimcv/plugins/imv_swid/imv_swid_agent.c
@@ -20,21 +20,19 @@
 #include "imv_swid_state.h"
 #include "imv_swid_rest.h"
 
-#include "libpts.h"
-#include "swid/swid_error.h"
-#include "swid/swid_inventory.h"
-#include "tcg/seg/tcg_seg_attr_max_size.h"
-#include "tcg/seg/tcg_seg_attr_seg_env.h"
-#include "tcg/swid/tcg_swid_attr_req.h"
-#include "tcg/swid/tcg_swid_attr_tag_inv.h"
-#include "tcg/swid/tcg_swid_attr_tag_id_inv.h"
-
 #include <imcv.h>
-#include <ietf/ietf_attr_pa_tnc_error.h>
 #include <imv/imv_agent.h>
 #include <imv/imv_msg.h>
+#include <ietf/ietf_attr_pa_tnc_error.h>
 #include <ita/ita_attr.h>
 #include <ita/ita_attr_angel.h>
+#include "tcg/seg/tcg_seg_attr_max_size.h"
+#include "tcg/seg/tcg_seg_attr_seg_env.h"
+#include "tcg/swid/tcg_swid_attr_req.h"
+#include "tcg/swid/tcg_swid_attr_tag_inv.h"
+#include "tcg/swid/tcg_swid_attr_tag_id_inv.h"
+#include "swid/swid_error.h"
+#include "swid/swid_inventory.h"
 
 #include <tncif_names.h>
 #include <tncif_pa_subtypes.h>
@@ -704,7 +702,6 @@ METHOD(imv_agent_if_t, destroy, void,
 	DESTROY_IF(this->rest_api);
 	this->agent->destroy(this->agent);
 	free(this);
-	libpts_deinit();
 }
 
 /**
@@ -748,7 +745,6 @@ imv_agent_if_t *imv_swid_agent_create(const char *name, TNC_IMVID id,
 	{
 		this->rest_api = imv_swid_rest_create(rest_api_uri, rest_api_timeout);
 	}
-	libpts_init();
 
 	return &this->public;
 }
diff --git a/src/libpts/plugins/imv_swid/imv_swid_agent.h b/src/libimcv/plugins/imv_swid/imv_swid_agent.h
index 4218040bc..4218040bc 100644
--- a/src/libpts/plugins/imv_swid/imv_swid_agent.h
+++ b/src/libimcv/plugins/imv_swid/imv_swid_agent.h
diff --git a/src/libpts/plugins/imv_swid/imv_swid_rest.c b/src/libimcv/plugins/imv_swid/imv_swid_rest.c
index 143b0b239..143b0b239 100644
--- a/src/libpts/plugins/imv_swid/imv_swid_rest.c
+++ b/src/libimcv/plugins/imv_swid/imv_swid_rest.c
diff --git a/src/libpts/plugins/imv_swid/imv_swid_rest.h b/src/libimcv/plugins/imv_swid/imv_swid_rest.h
index 32392cbe6..32392cbe6 100644
--- a/src/libpts/plugins/imv_swid/imv_swid_rest.h
+++ b/src/libimcv/plugins/imv_swid/imv_swid_rest.h
diff --git a/src/libpts/plugins/imv_swid/imv_swid_state.c b/src/libimcv/plugins/imv_swid/imv_swid_state.c
index 885de62ce..885de62ce 100644
--- a/src/libpts/plugins/imv_swid/imv_swid_state.c
+++ b/src/libimcv/plugins/imv_swid/imv_swid_state.c
diff --git a/src/libpts/plugins/imv_swid/imv_swid_state.h b/src/libimcv/plugins/imv_swid/imv_swid_state.h
index a6a8d0332..a6a8d0332 100644
--- a/src/libpts/plugins/imv_swid/imv_swid_state.h
+++ b/src/libimcv/plugins/imv_swid/imv_swid_state.h
diff --git a/src/libpts/pts/components/ita/ita_comp_func_name.c b/src/libimcv/pts/components/ita/ita_comp_func_name.c
index a593281ba..a593281ba 100644
--- a/src/libpts/pts/components/ita/ita_comp_func_name.c
+++ b/src/libimcv/pts/components/ita/ita_comp_func_name.c
diff --git a/src/libpts/pts/components/ita/ita_comp_func_name.h b/src/libimcv/pts/components/ita/ita_comp_func_name.h
index eb2f363f3..eb2f363f3 100644
--- a/src/libpts/pts/components/ita/ita_comp_func_name.h
+++ b/src/libimcv/pts/components/ita/ita_comp_func_name.h
diff --git a/src/libpts/pts/components/ita/ita_comp_ima.c b/src/libimcv/pts/components/ita/ita_comp_ima.c
index be8aa40ad..3f92b04b1 100644
--- a/src/libpts/pts/components/ita/ita_comp_ima.c
+++ b/src/libimcv/pts/components/ita/ita_comp_ima.c
@@ -16,7 +16,7 @@
 #include "ita_comp_ima.h"
 #include "ita_comp_func_name.h"
 
-#include "libpts.h"
+#include "imcv.h"
 #include "pts/pts_pcr.h"
 #include "pts/pts_ima_bios_list.h"
 #include "pts/pts_ima_event_list.h"
diff --git a/src/libpts/pts/components/ita/ita_comp_ima.h b/src/libimcv/pts/components/ita/ita_comp_ima.h
index 546d0a4b2..546d0a4b2 100644
--- a/src/libpts/pts/components/ita/ita_comp_ima.h
+++ b/src/libimcv/pts/components/ita/ita_comp_ima.h
diff --git a/src/libpts/pts/components/ita/ita_comp_tboot.c b/src/libimcv/pts/components/ita/ita_comp_tboot.c
index 67be1ca3a..273c18f31 100644
--- a/src/libpts/pts/components/ita/ita_comp_tboot.c
+++ b/src/libimcv/pts/components/ita/ita_comp_tboot.c
@@ -16,7 +16,7 @@
 #include "ita_comp_tboot.h"
 #include "ita_comp_func_name.h"
 
-#include "libpts.h"
+#include "imcv.h"
 #include "pts/components/pts_component.h"
 
 #include <utils/debug.h>
@@ -215,7 +215,7 @@ METHOD(pts_component_t, verify, status_t,
 	}
 	vid = this->name->get_vendor_id(this->name);
 	name = this->name->get_name(this->name);
-	names = pts_components->get_comp_func_names(pts_components, vid);
+	names = imcv_pts_components->get_comp_func_names(imcv_pts_components, vid);
 
 	if (this->count)
 	{
@@ -320,7 +320,8 @@ METHOD(pts_component_t, destroy, void,
 												this->cid, this->aik_id);
 			vid = this->name->get_vendor_id(this->name);
 			name = this->name->get_name(this->name);
-			names = pts_components->get_comp_func_names(pts_components, vid);
+			names = imcv_pts_components->get_comp_func_names(imcv_pts_components,
+												vid);
 			DBG1(DBG_PTS, "deleted %d registered %N '%N' functional component "
 				 "evidence measurements", count, pen_names, vid, names, name);
 		}
diff --git a/src/libpts/pts/components/ita/ita_comp_tboot.h b/src/libimcv/pts/components/ita/ita_comp_tboot.h
index 1e1a14831..1e1a14831 100644
--- a/src/libpts/pts/components/ita/ita_comp_tboot.h
+++ b/src/libimcv/pts/components/ita/ita_comp_tboot.h
diff --git a/src/libpts/pts/components/ita/ita_comp_tgrub.c b/src/libimcv/pts/components/ita/ita_comp_tgrub.c
index 097e4c89c..097e4c89c 100644
--- a/src/libpts/pts/components/ita/ita_comp_tgrub.c
+++ b/src/libimcv/pts/components/ita/ita_comp_tgrub.c
diff --git a/src/libpts/pts/components/ita/ita_comp_tgrub.h b/src/libimcv/pts/components/ita/ita_comp_tgrub.h
index 59913c82d..59913c82d 100644
--- a/src/libpts/pts/components/ita/ita_comp_tgrub.h
+++ b/src/libimcv/pts/components/ita/ita_comp_tgrub.h
diff --git a/src/libpts/pts/components/pts_comp_evidence.c b/src/libimcv/pts/components/pts_comp_evidence.c
index 08c3d5e9a..08c3d5e9a 100644
--- a/src/libpts/pts/components/pts_comp_evidence.c
+++ b/src/libimcv/pts/components/pts_comp_evidence.c
diff --git a/src/libpts/pts/components/pts_comp_evidence.h b/src/libimcv/pts/components/pts_comp_evidence.h
index 55776ce8b..55776ce8b 100644
--- a/src/libpts/pts/components/pts_comp_evidence.h
+++ b/src/libimcv/pts/components/pts_comp_evidence.h
diff --git a/src/libpts/pts/components/pts_comp_func_name.c b/src/libimcv/pts/components/pts_comp_func_name.c
index 6c630f8fb..e12522ed1 100644
--- a/src/libpts/pts/components/pts_comp_func_name.c
+++ b/src/libimcv/pts/components/pts_comp_func_name.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2012 Andreas Steffen
+ * Copyright (C) 2011-2014 Andreas Steffen
  *
  * HSR Hochschule fuer Technik Rapperswil
  *
@@ -14,7 +14,7 @@
  * for more details.
  */
 
-#include "libpts.h"
+#include "imcv.h"
 #include "pts/components/pts_comp_func_name.h"
 
 #include <utils/debug.h>
@@ -108,9 +108,12 @@ METHOD(pts_comp_func_name_t, log_, void,
 	char flags[8];
 	int type;
 
-	names = pts_components->get_comp_func_names(pts_components, this->vid);
-	types = pts_components->get_qualifier_type_names(pts_components, this->vid);
-	type =  pts_components->get_qualifier(pts_components, &this->public, flags);
+	names = imcv_pts_components->get_comp_func_names(imcv_pts_components,
+											this->vid);
+	types = imcv_pts_components->get_qualifier_type_names(imcv_pts_components,
+											this->vid);
+	type =  imcv_pts_components->get_qualifier(imcv_pts_components,
+											&this->public, flags);
 
 	if (names && types)
 	{
diff --git a/src/libpts/pts/components/pts_comp_func_name.h b/src/libimcv/pts/components/pts_comp_func_name.h
index 90ad7083f..90ad7083f 100644
--- a/src/libpts/pts/components/pts_comp_func_name.h
+++ b/src/libimcv/pts/components/pts_comp_func_name.h
diff --git a/src/libpts/pts/components/pts_component.h b/src/libimcv/pts/components/pts_component.h
index 71b1ad59c..71b1ad59c 100644
--- a/src/libpts/pts/components/pts_component.h
+++ b/src/libimcv/pts/components/pts_component.h
diff --git a/src/libpts/pts/components/pts_component_manager.c b/src/libimcv/pts/components/pts_component_manager.c
index 9c1375b79..9c1375b79 100644
--- a/src/libpts/pts/components/pts_component_manager.c
+++ b/src/libimcv/pts/components/pts_component_manager.c
diff --git a/src/libpts/pts/components/pts_component_manager.h b/src/libimcv/pts/components/pts_component_manager.h
index 61055ec74..61055ec74 100644
--- a/src/libpts/pts/components/pts_component_manager.h
+++ b/src/libimcv/pts/components/pts_component_manager.h
diff --git a/src/libpts/pts/components/tcg/tcg_comp_func_name.c b/src/libimcv/pts/components/tcg/tcg_comp_func_name.c
index a70c84e48..a70c84e48 100644
--- a/src/libpts/pts/components/tcg/tcg_comp_func_name.c
+++ b/src/libimcv/pts/components/tcg/tcg_comp_func_name.c
diff --git a/src/libpts/pts/components/tcg/tcg_comp_func_name.h b/src/libimcv/pts/components/tcg/tcg_comp_func_name.h
index 9708ad09d..9708ad09d 100644
--- a/src/libpts/pts/components/tcg/tcg_comp_func_name.h
+++ b/src/libimcv/pts/components/tcg/tcg_comp_func_name.h
diff --git a/src/libpts/pts/pts.c b/src/libimcv/pts/pts.c
index 2fff4c901..2fff4c901 100644
--- a/src/libpts/pts/pts.c
+++ b/src/libimcv/pts/pts.c
diff --git a/src/libpts/pts/pts.h b/src/libimcv/pts/pts.h
index fead588ae..fead588ae 100644
--- a/src/libpts/pts/pts.h
+++ b/src/libimcv/pts/pts.h
diff --git a/src/libpts/pts/pts_creds.c b/src/libimcv/pts/pts_creds.c
index bc483eb84..bc483eb84 100644
--- a/src/libpts/pts/pts_creds.c
+++ b/src/libimcv/pts/pts_creds.c
diff --git a/src/libpts/pts/pts_creds.h b/src/libimcv/pts/pts_creds.h
index eb9c39537..eb9c39537 100644
--- a/src/libpts/pts/pts_creds.h
+++ b/src/libimcv/pts/pts_creds.h
diff --git a/src/libpts/pts/pts_database.c b/src/libimcv/pts/pts_database.c
index d7b85c138..d7b85c138 100644
--- a/src/libpts/pts/pts_database.c
+++ b/src/libimcv/pts/pts_database.c
diff --git a/src/libpts/pts/pts_database.h b/src/libimcv/pts/pts_database.h
index a6c9fb3b6..a6c9fb3b6 100644
--- a/src/libpts/pts/pts_database.h
+++ b/src/libimcv/pts/pts_database.h
diff --git a/src/libpts/pts/pts_dh_group.c b/src/libimcv/pts/pts_dh_group.c
index 305b4ec4f..305b4ec4f 100644
--- a/src/libpts/pts/pts_dh_group.c
+++ b/src/libimcv/pts/pts_dh_group.c
diff --git a/src/libpts/pts/pts_dh_group.h b/src/libimcv/pts/pts_dh_group.h
index f5d951e9a..f5d951e9a 100644
--- a/src/libpts/pts/pts_dh_group.h
+++ b/src/libimcv/pts/pts_dh_group.h
diff --git a/src/libpts/pts/pts_error.c b/src/libimcv/pts/pts_error.c
index 1e79689f9..1e79689f9 100644
--- a/src/libpts/pts/pts_error.c
+++ b/src/libimcv/pts/pts_error.c
diff --git a/src/libpts/pts/pts_error.h b/src/libimcv/pts/pts_error.h
index 9a53abd98..9a53abd98 100644
--- a/src/libpts/pts/pts_error.h
+++ b/src/libimcv/pts/pts_error.h
diff --git a/src/libpts/pts/pts_file_meas.c b/src/libimcv/pts/pts_file_meas.c
index 478892aea..478892aea 100644
--- a/src/libpts/pts/pts_file_meas.c
+++ b/src/libimcv/pts/pts_file_meas.c
diff --git a/src/libpts/pts/pts_file_meas.h b/src/libimcv/pts/pts_file_meas.h
index 4bf28e280..4bf28e280 100644
--- a/src/libpts/pts/pts_file_meas.h
+++ b/src/libimcv/pts/pts_file_meas.h
diff --git a/src/libpts/pts/pts_file_meta.c b/src/libimcv/pts/pts_file_meta.c
index 9cca0a5a5..9cca0a5a5 100644
--- a/src/libpts/pts/pts_file_meta.c
+++ b/src/libimcv/pts/pts_file_meta.c
diff --git a/src/libpts/pts/pts_file_meta.h b/src/libimcv/pts/pts_file_meta.h
index 3f1813306..3f1813306 100644
--- a/src/libpts/pts/pts_file_meta.h
+++ b/src/libimcv/pts/pts_file_meta.h
diff --git a/src/libpts/pts/pts_file_type.c b/src/libimcv/pts/pts_file_type.c
index fe849dea4..fe849dea4 100644
--- a/src/libpts/pts/pts_file_type.c
+++ b/src/libimcv/pts/pts_file_type.c
diff --git a/src/libpts/pts/pts_file_type.h b/src/libimcv/pts/pts_file_type.h
index c1d236888..c1d236888 100644
--- a/src/libpts/pts/pts_file_type.h
+++ b/src/libimcv/pts/pts_file_type.h
diff --git a/src/libpts/pts/pts_ima_bios_list.c b/src/libimcv/pts/pts_ima_bios_list.c
index 5051b6c2d..5051b6c2d 100644
--- a/src/libpts/pts/pts_ima_bios_list.c
+++ b/src/libimcv/pts/pts_ima_bios_list.c
diff --git a/src/libpts/pts/pts_ima_bios_list.h b/src/libimcv/pts/pts_ima_bios_list.h
index ad162e15a..ad162e15a 100644
--- a/src/libpts/pts/pts_ima_bios_list.h
+++ b/src/libimcv/pts/pts_ima_bios_list.h
diff --git a/src/libpts/pts/pts_ima_event_list.c b/src/libimcv/pts/pts_ima_event_list.c
index 9bff4654b..9bff4654b 100644
--- a/src/libpts/pts/pts_ima_event_list.c
+++ b/src/libimcv/pts/pts_ima_event_list.c
diff --git a/src/libpts/pts/pts_ima_event_list.h b/src/libimcv/pts/pts_ima_event_list.h
index bf5478a51..bf5478a51 100644
--- a/src/libpts/pts/pts_ima_event_list.h
+++ b/src/libimcv/pts/pts_ima_event_list.h
diff --git a/src/libpts/pts/pts_meas_algo.c b/src/libimcv/pts/pts_meas_algo.c
index c06371123..c06371123 100644
--- a/src/libpts/pts/pts_meas_algo.c
+++ b/src/libimcv/pts/pts_meas_algo.c
diff --git a/src/libpts/pts/pts_meas_algo.h b/src/libimcv/pts/pts_meas_algo.h
index eec7e7981..eec7e7981 100644
--- a/src/libpts/pts/pts_meas_algo.h
+++ b/src/libimcv/pts/pts_meas_algo.h
diff --git a/src/libpts/pts/pts_pcr.c b/src/libimcv/pts/pts_pcr.c
index 0af93b608..0af93b608 100644
--- a/src/libpts/pts/pts_pcr.c
+++ b/src/libimcv/pts/pts_pcr.c
diff --git a/src/libpts/pts/pts_pcr.h b/src/libimcv/pts/pts_pcr.h
index f638b5ee4..f638b5ee4 100644
--- a/src/libpts/pts/pts_pcr.h
+++ b/src/libimcv/pts/pts_pcr.h
diff --git a/src/libpts/pts/pts_proto_caps.h b/src/libimcv/pts/pts_proto_caps.h
index 4346d9b79..4346d9b79 100644
--- a/src/libpts/pts/pts_proto_caps.h
+++ b/src/libimcv/pts/pts_proto_caps.h
diff --git a/src/libpts/pts/pts_req_func_comp_evid.h b/src/libimcv/pts/pts_req_func_comp_evid.h
index bbf5bbf5b..bbf5bbf5b 100644
--- a/src/libpts/pts/pts_req_func_comp_evid.h
+++ b/src/libimcv/pts/pts_req_func_comp_evid.h
diff --git a/src/libpts/pts/pts_simple_evid_final.h b/src/libimcv/pts/pts_simple_evid_final.h
index 0c8dea0cc..0c8dea0cc 100644
--- a/src/libpts/pts/pts_simple_evid_final.h
+++ b/src/libimcv/pts/pts_simple_evid_final.h
diff --git a/src/libimcv/seg/seg_contract.c b/src/libimcv/seg/seg_contract.c
index 589d6d1cd..38e954d95 100644
--- a/src/libimcv/seg/seg_contract.c
+++ b/src/libimcv/seg/seg_contract.c
@@ -15,14 +15,13 @@
 
 #include "seg_contract.h"
 #include "seg_env.h"
+#include "tcg/seg/tcg_seg_attr_seg_env.h"
 
 #include <utils/debug.h>
 #include <bio/bio_writer.h>
 
 #include <tncif_pa_subtypes.h>
 
-#include <tcg/seg/tcg_seg_attr_seg_env.h>
-
 typedef struct private_seg_contract_t private_seg_contract_t;
 
 /**
diff --git a/src/libimcv/seg/seg_env.c b/src/libimcv/seg/seg_env.c
index 1f4cfc53f..1ec8a367b 100644
--- a/src/libimcv/seg/seg_env.c
+++ b/src/libimcv/seg/seg_env.c
@@ -17,13 +17,12 @@
 
 #include "imcv.h"
 #include "pa_tnc/pa_tnc_msg.h"
+#include "tcg/seg/tcg_seg_attr_seg_env.h"
 
 #include <utils/debug.h>
 #include <bio/bio_reader.h>
 #include <bio/bio_writer.h>
 
-#include <tcg/seg/tcg_seg_attr_seg_env.h>
-
 #define BASE_ATTR_ID_PREFIX	0xFF
 
 typedef struct private_seg_env_t private_seg_env_t;
diff --git a/src/libpts/swid/swid_error.c b/src/libimcv/swid/swid_error.c
index 7f3c34476..7f3c34476 100644
--- a/src/libpts/swid/swid_error.c
+++ b/src/libimcv/swid/swid_error.c
diff --git a/src/libpts/swid/swid_error.h b/src/libimcv/swid/swid_error.h
index 1da6148ff..1da6148ff 100644
--- a/src/libpts/swid/swid_error.h
+++ b/src/libimcv/swid/swid_error.h
diff --git a/src/libpts/swid/swid_inventory.c b/src/libimcv/swid/swid_inventory.c
index a9f081efa..a9f081efa 100644
--- a/src/libpts/swid/swid_inventory.c
+++ b/src/libimcv/swid/swid_inventory.c
diff --git a/src/libpts/swid/swid_inventory.h b/src/libimcv/swid/swid_inventory.h
index 7de8bb221..7de8bb221 100644
--- a/src/libpts/swid/swid_inventory.h
+++ b/src/libimcv/swid/swid_inventory.h
diff --git a/src/libpts/swid/swid_tag.c b/src/libimcv/swid/swid_tag.c
index c77c75700..c77c75700 100644
--- a/src/libpts/swid/swid_tag.c
+++ b/src/libimcv/swid/swid_tag.c
diff --git a/src/libpts/swid/swid_tag.h b/src/libimcv/swid/swid_tag.h
index 0e2eb499f..0e2eb499f 100644
--- a/src/libpts/swid/swid_tag.h
+++ b/src/libimcv/swid/swid_tag.h
diff --git a/src/libpts/swid/swid_tag_id.c b/src/libimcv/swid/swid_tag_id.c
index 2dc6e3141..2dc6e3141 100644
--- a/src/libpts/swid/swid_tag_id.c
+++ b/src/libimcv/swid/swid_tag_id.c
diff --git a/src/libpts/swid/swid_tag_id.h b/src/libimcv/swid/swid_tag_id.h
index 9761f2af3..9761f2af3 100644
--- a/src/libpts/swid/swid_tag_id.h
+++ b/src/libimcv/swid/swid_tag_id.h
diff --git a/src/libpts/tcg/pts/tcg_pts_attr_aik.c b/src/libimcv/tcg/pts/tcg_pts_attr_aik.c
index 17a8db5d6..17a8db5d6 100644
--- a/src/libpts/tcg/pts/tcg_pts_attr_aik.c
+++ b/src/libimcv/tcg/pts/tcg_pts_attr_aik.c
diff --git a/src/libpts/tcg/pts/tcg_pts_attr_aik.h b/src/libimcv/tcg/pts/tcg_pts_attr_aik.h
index 0962432e9..0962432e9 100644
--- a/src/libpts/tcg/pts/tcg_pts_attr_aik.h
+++ b/src/libimcv/tcg/pts/tcg_pts_attr_aik.h
diff --git a/src/libpts/tcg/pts/tcg_pts_attr_dh_nonce_finish.c b/src/libimcv/tcg/pts/tcg_pts_attr_dh_nonce_finish.c
index 6119b4973..6119b4973 100644
--- a/src/libpts/tcg/pts/tcg_pts_attr_dh_nonce_finish.c
+++ b/src/libimcv/tcg/pts/tcg_pts_attr_dh_nonce_finish.c
diff --git a/src/libpts/tcg/pts/tcg_pts_attr_dh_nonce_finish.h b/src/libimcv/tcg/pts/tcg_pts_attr_dh_nonce_finish.h
index efe6fd153..efe6fd153 100644
--- a/src/libpts/tcg/pts/tcg_pts_attr_dh_nonce_finish.h
+++ b/src/libimcv/tcg/pts/tcg_pts_attr_dh_nonce_finish.h
diff --git a/src/libpts/tcg/pts/tcg_pts_attr_dh_nonce_params_req.c b/src/libimcv/tcg/pts/tcg_pts_attr_dh_nonce_params_req.c
index 7761b977d..7761b977d 100644
--- a/src/libpts/tcg/pts/tcg_pts_attr_dh_nonce_params_req.c
+++ b/src/libimcv/tcg/pts/tcg_pts_attr_dh_nonce_params_req.c
diff --git a/src/libpts/tcg/pts/tcg_pts_attr_dh_nonce_params_req.h b/src/libimcv/tcg/pts/tcg_pts_attr_dh_nonce_params_req.h
index 024648abb..024648abb 100644
--- a/src/libpts/tcg/pts/tcg_pts_attr_dh_nonce_params_req.h
+++ b/src/libimcv/tcg/pts/tcg_pts_attr_dh_nonce_params_req.h
diff --git a/src/libpts/tcg/pts/tcg_pts_attr_dh_nonce_params_resp.c b/src/libimcv/tcg/pts/tcg_pts_attr_dh_nonce_params_resp.c
index eb0d0e533..eb0d0e533 100644
--- a/src/libpts/tcg/pts/tcg_pts_attr_dh_nonce_params_resp.c
+++ b/src/libimcv/tcg/pts/tcg_pts_attr_dh_nonce_params_resp.c
diff --git a/src/libpts/tcg/pts/tcg_pts_attr_dh_nonce_params_resp.h b/src/libimcv/tcg/pts/tcg_pts_attr_dh_nonce_params_resp.h
index 72046d2ed..72046d2ed 100644
--- a/src/libpts/tcg/pts/tcg_pts_attr_dh_nonce_params_resp.h
+++ b/src/libimcv/tcg/pts/tcg_pts_attr_dh_nonce_params_resp.h
diff --git a/src/libpts/tcg/pts/tcg_pts_attr_file_meas.c b/src/libimcv/tcg/pts/tcg_pts_attr_file_meas.c
index b9095f5be..b9095f5be 100644
--- a/src/libpts/tcg/pts/tcg_pts_attr_file_meas.c
+++ b/src/libimcv/tcg/pts/tcg_pts_attr_file_meas.c
diff --git a/src/libpts/tcg/pts/tcg_pts_attr_file_meas.h b/src/libimcv/tcg/pts/tcg_pts_attr_file_meas.h
index 4f155f05b..4f155f05b 100644
--- a/src/libpts/tcg/pts/tcg_pts_attr_file_meas.h
+++ b/src/libimcv/tcg/pts/tcg_pts_attr_file_meas.h
diff --git a/src/libpts/tcg/pts/tcg_pts_attr_gen_attest_evid.c b/src/libimcv/tcg/pts/tcg_pts_attr_gen_attest_evid.c
index f263747a3..f263747a3 100644
--- a/src/libpts/tcg/pts/tcg_pts_attr_gen_attest_evid.c
+++ b/src/libimcv/tcg/pts/tcg_pts_attr_gen_attest_evid.c
diff --git a/src/libpts/tcg/pts/tcg_pts_attr_gen_attest_evid.h b/src/libimcv/tcg/pts/tcg_pts_attr_gen_attest_evid.h
index 38909b025..38909b025 100644
--- a/src/libpts/tcg/pts/tcg_pts_attr_gen_attest_evid.h
+++ b/src/libimcv/tcg/pts/tcg_pts_attr_gen_attest_evid.h
diff --git a/src/libpts/tcg/pts/tcg_pts_attr_get_aik.c b/src/libimcv/tcg/pts/tcg_pts_attr_get_aik.c
index cf944d2a9..cf944d2a9 100644
--- a/src/libpts/tcg/pts/tcg_pts_attr_get_aik.c
+++ b/src/libimcv/tcg/pts/tcg_pts_attr_get_aik.c
diff --git a/src/libpts/tcg/pts/tcg_pts_attr_get_aik.h b/src/libimcv/tcg/pts/tcg_pts_attr_get_aik.h
index 120100e59..120100e59 100644
--- a/src/libpts/tcg/pts/tcg_pts_attr_get_aik.h
+++ b/src/libimcv/tcg/pts/tcg_pts_attr_get_aik.h
diff --git a/src/libpts/tcg/pts/tcg_pts_attr_get_tpm_version_info.c b/src/libimcv/tcg/pts/tcg_pts_attr_get_tpm_version_info.c
index 647c426ed..647c426ed 100644
--- a/src/libpts/tcg/pts/tcg_pts_attr_get_tpm_version_info.c
+++ b/src/libimcv/tcg/pts/tcg_pts_attr_get_tpm_version_info.c
diff --git a/src/libpts/tcg/pts/tcg_pts_attr_get_tpm_version_info.h b/src/libimcv/tcg/pts/tcg_pts_attr_get_tpm_version_info.h
index 711a1d50c..711a1d50c 100644
--- a/src/libpts/tcg/pts/tcg_pts_attr_get_tpm_version_info.h
+++ b/src/libimcv/tcg/pts/tcg_pts_attr_get_tpm_version_info.h
diff --git a/src/libpts/tcg/pts/tcg_pts_attr_meas_algo.c b/src/libimcv/tcg/pts/tcg_pts_attr_meas_algo.c
index a4dac9070..a4dac9070 100644
--- a/src/libpts/tcg/pts/tcg_pts_attr_meas_algo.c
+++ b/src/libimcv/tcg/pts/tcg_pts_attr_meas_algo.c
diff --git a/src/libpts/tcg/pts/tcg_pts_attr_meas_algo.h b/src/libimcv/tcg/pts/tcg_pts_attr_meas_algo.h
index 88d1be0aa..88d1be0aa 100644
--- a/src/libpts/tcg/pts/tcg_pts_attr_meas_algo.h
+++ b/src/libimcv/tcg/pts/tcg_pts_attr_meas_algo.h
diff --git a/src/libpts/tcg/pts/tcg_pts_attr_proto_caps.c b/src/libimcv/tcg/pts/tcg_pts_attr_proto_caps.c
index 6473ea808..6473ea808 100644
--- a/src/libpts/tcg/pts/tcg_pts_attr_proto_caps.c
+++ b/src/libimcv/tcg/pts/tcg_pts_attr_proto_caps.c
diff --git a/src/libpts/tcg/pts/tcg_pts_attr_proto_caps.h b/src/libimcv/tcg/pts/tcg_pts_attr_proto_caps.h
index c2478da0b..c2478da0b 100644
--- a/src/libpts/tcg/pts/tcg_pts_attr_proto_caps.h
+++ b/src/libimcv/tcg/pts/tcg_pts_attr_proto_caps.h
diff --git a/src/libpts/tcg/pts/tcg_pts_attr_req_file_meas.c b/src/libimcv/tcg/pts/tcg_pts_attr_req_file_meas.c
index c5a2f4b8a..c5a2f4b8a 100644
--- a/src/libpts/tcg/pts/tcg_pts_attr_req_file_meas.c
+++ b/src/libimcv/tcg/pts/tcg_pts_attr_req_file_meas.c
diff --git a/src/libpts/tcg/pts/tcg_pts_attr_req_file_meas.h b/src/libimcv/tcg/pts/tcg_pts_attr_req_file_meas.h
index 135c088bf..135c088bf 100644
--- a/src/libpts/tcg/pts/tcg_pts_attr_req_file_meas.h
+++ b/src/libimcv/tcg/pts/tcg_pts_attr_req_file_meas.h
diff --git a/src/libpts/tcg/pts/tcg_pts_attr_req_file_meta.c b/src/libimcv/tcg/pts/tcg_pts_attr_req_file_meta.c
index 8d703af65..8d703af65 100644
--- a/src/libpts/tcg/pts/tcg_pts_attr_req_file_meta.c
+++ b/src/libimcv/tcg/pts/tcg_pts_attr_req_file_meta.c
diff --git a/src/libpts/tcg/pts/tcg_pts_attr_req_file_meta.h b/src/libimcv/tcg/pts/tcg_pts_attr_req_file_meta.h
index 9aa1b93d6..9aa1b93d6 100644
--- a/src/libpts/tcg/pts/tcg_pts_attr_req_file_meta.h
+++ b/src/libimcv/tcg/pts/tcg_pts_attr_req_file_meta.h
diff --git a/src/libpts/tcg/pts/tcg_pts_attr_req_func_comp_evid.c b/src/libimcv/tcg/pts/tcg_pts_attr_req_func_comp_evid.c
index e10845bbb..e10845bbb 100644
--- a/src/libpts/tcg/pts/tcg_pts_attr_req_func_comp_evid.c
+++ b/src/libimcv/tcg/pts/tcg_pts_attr_req_func_comp_evid.c
diff --git a/src/libpts/tcg/pts/tcg_pts_attr_req_func_comp_evid.h b/src/libimcv/tcg/pts/tcg_pts_attr_req_func_comp_evid.h
index 2c0b8a974..2c0b8a974 100644
--- a/src/libpts/tcg/pts/tcg_pts_attr_req_func_comp_evid.h
+++ b/src/libimcv/tcg/pts/tcg_pts_attr_req_func_comp_evid.h
diff --git a/src/libpts/tcg/pts/tcg_pts_attr_simple_comp_evid.c b/src/libimcv/tcg/pts/tcg_pts_attr_simple_comp_evid.c
index 40f380ab4..40f380ab4 100644
--- a/src/libpts/tcg/pts/tcg_pts_attr_simple_comp_evid.c
+++ b/src/libimcv/tcg/pts/tcg_pts_attr_simple_comp_evid.c
diff --git a/src/libpts/tcg/pts/tcg_pts_attr_simple_comp_evid.h b/src/libimcv/tcg/pts/tcg_pts_attr_simple_comp_evid.h
index 628fad621..628fad621 100644
--- a/src/libpts/tcg/pts/tcg_pts_attr_simple_comp_evid.h
+++ b/src/libimcv/tcg/pts/tcg_pts_attr_simple_comp_evid.h
diff --git a/src/libpts/tcg/pts/tcg_pts_attr_simple_evid_final.c b/src/libimcv/tcg/pts/tcg_pts_attr_simple_evid_final.c
index baadd943f..baadd943f 100644
--- a/src/libpts/tcg/pts/tcg_pts_attr_simple_evid_final.c
+++ b/src/libimcv/tcg/pts/tcg_pts_attr_simple_evid_final.c
diff --git a/src/libpts/tcg/pts/tcg_pts_attr_simple_evid_final.h b/src/libimcv/tcg/pts/tcg_pts_attr_simple_evid_final.h
index 1fac2e1ce..1fac2e1ce 100644
--- a/src/libpts/tcg/pts/tcg_pts_attr_simple_evid_final.h
+++ b/src/libimcv/tcg/pts/tcg_pts_attr_simple_evid_final.h
diff --git a/src/libpts/tcg/pts/tcg_pts_attr_tpm_version_info.c b/src/libimcv/tcg/pts/tcg_pts_attr_tpm_version_info.c
index b776cb662..b776cb662 100644
--- a/src/libpts/tcg/pts/tcg_pts_attr_tpm_version_info.c
+++ b/src/libimcv/tcg/pts/tcg_pts_attr_tpm_version_info.c
diff --git a/src/libpts/tcg/pts/tcg_pts_attr_tpm_version_info.h b/src/libimcv/tcg/pts/tcg_pts_attr_tpm_version_info.h
index e03b57f79..e03b57f79 100644
--- a/src/libpts/tcg/pts/tcg_pts_attr_tpm_version_info.h
+++ b/src/libimcv/tcg/pts/tcg_pts_attr_tpm_version_info.h
diff --git a/src/libpts/tcg/pts/tcg_pts_attr_unix_file_meta.c b/src/libimcv/tcg/pts/tcg_pts_attr_unix_file_meta.c
index eff64c229..eff64c229 100644
--- a/src/libpts/tcg/pts/tcg_pts_attr_unix_file_meta.c
+++ b/src/libimcv/tcg/pts/tcg_pts_attr_unix_file_meta.c
diff --git a/src/libpts/tcg/pts/tcg_pts_attr_unix_file_meta.h b/src/libimcv/tcg/pts/tcg_pts_attr_unix_file_meta.h
index 2118d3920..2118d3920 100644
--- a/src/libpts/tcg/pts/tcg_pts_attr_unix_file_meta.h
+++ b/src/libimcv/tcg/pts/tcg_pts_attr_unix_file_meta.h
diff --git a/src/libpts/tcg/seg/tcg_seg_attr_max_size.c b/src/libimcv/tcg/seg/tcg_seg_attr_max_size.c
index 8e82314d1..8e82314d1 100644
--- a/src/libpts/tcg/seg/tcg_seg_attr_max_size.c
+++ b/src/libimcv/tcg/seg/tcg_seg_attr_max_size.c
diff --git a/src/libpts/tcg/seg/tcg_seg_attr_max_size.h b/src/libimcv/tcg/seg/tcg_seg_attr_max_size.h
index 404e85a01..404e85a01 100644
--- a/src/libpts/tcg/seg/tcg_seg_attr_max_size.h
+++ b/src/libimcv/tcg/seg/tcg_seg_attr_max_size.h
diff --git a/src/libpts/tcg/seg/tcg_seg_attr_next_seg.c b/src/libimcv/tcg/seg/tcg_seg_attr_next_seg.c
index 22934cc1f..22934cc1f 100644
--- a/src/libpts/tcg/seg/tcg_seg_attr_next_seg.c
+++ b/src/libimcv/tcg/seg/tcg_seg_attr_next_seg.c
diff --git a/src/libpts/tcg/seg/tcg_seg_attr_next_seg.h b/src/libimcv/tcg/seg/tcg_seg_attr_next_seg.h
index c9f53f853..c9f53f853 100644
--- a/src/libpts/tcg/seg/tcg_seg_attr_next_seg.h
+++ b/src/libimcv/tcg/seg/tcg_seg_attr_next_seg.h
diff --git a/src/libpts/tcg/seg/tcg_seg_attr_seg_env.c b/src/libimcv/tcg/seg/tcg_seg_attr_seg_env.c
index 833111f8f..833111f8f 100644
--- a/src/libpts/tcg/seg/tcg_seg_attr_seg_env.c
+++ b/src/libimcv/tcg/seg/tcg_seg_attr_seg_env.c
diff --git a/src/libpts/tcg/seg/tcg_seg_attr_seg_env.h b/src/libimcv/tcg/seg/tcg_seg_attr_seg_env.h
index 19184392b..19184392b 100644
--- a/src/libpts/tcg/seg/tcg_seg_attr_seg_env.h
+++ b/src/libimcv/tcg/seg/tcg_seg_attr_seg_env.h
diff --git a/src/libpts/tcg/swid/tcg_swid_attr_req.c b/src/libimcv/tcg/swid/tcg_swid_attr_req.c
index c403d06f9..c403d06f9 100644
--- a/src/libpts/tcg/swid/tcg_swid_attr_req.c
+++ b/src/libimcv/tcg/swid/tcg_swid_attr_req.c
diff --git a/src/libpts/tcg/swid/tcg_swid_attr_req.h b/src/libimcv/tcg/swid/tcg_swid_attr_req.h
index 59b597d84..59b597d84 100644
--- a/src/libpts/tcg/swid/tcg_swid_attr_req.h
+++ b/src/libimcv/tcg/swid/tcg_swid_attr_req.h
diff --git a/src/libpts/tcg/swid/tcg_swid_attr_tag_id_inv.c b/src/libimcv/tcg/swid/tcg_swid_attr_tag_id_inv.c
index d0b92c88f..d0b92c88f 100644
--- a/src/libpts/tcg/swid/tcg_swid_attr_tag_id_inv.c
+++ b/src/libimcv/tcg/swid/tcg_swid_attr_tag_id_inv.c
diff --git a/src/libpts/tcg/swid/tcg_swid_attr_tag_id_inv.h b/src/libimcv/tcg/swid/tcg_swid_attr_tag_id_inv.h
index c4ade904e..c4ade904e 100644
--- a/src/libpts/tcg/swid/tcg_swid_attr_tag_id_inv.h
+++ b/src/libimcv/tcg/swid/tcg_swid_attr_tag_id_inv.h
diff --git a/src/libpts/tcg/swid/tcg_swid_attr_tag_inv.c b/src/libimcv/tcg/swid/tcg_swid_attr_tag_inv.c
index 5864e5a91..5864e5a91 100644
--- a/src/libpts/tcg/swid/tcg_swid_attr_tag_inv.c
+++ b/src/libimcv/tcg/swid/tcg_swid_attr_tag_inv.c
diff --git a/src/libpts/tcg/swid/tcg_swid_attr_tag_inv.h b/src/libimcv/tcg/swid/tcg_swid_attr_tag_inv.h
index 69966c7d6..69966c7d6 100644
--- a/src/libpts/tcg/swid/tcg_swid_attr_tag_inv.h
+++ b/src/libimcv/tcg/swid/tcg_swid_attr_tag_inv.h
diff --git a/src/libpts/tcg/tcg_attr.c b/src/libimcv/tcg/tcg_attr.c
index d4ae1da67..d4ae1da67 100644
--- a/src/libpts/tcg/tcg_attr.c
+++ b/src/libimcv/tcg/tcg_attr.c
diff --git a/src/libpts/tcg/tcg_attr.h b/src/libimcv/tcg/tcg_attr.h
index 3964c8cab..3964c8cab 100644
--- a/src/libpts/tcg/tcg_attr.h
+++ b/src/libimcv/tcg/tcg_attr.h
diff --git a/src/libpts/Android.mk b/src/libpts/Android.mk
deleted file mode 100644
index ce328c52c..000000000
--- a/src/libpts/Android.mk
+++ /dev/null
@@ -1,78 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-
-# copy-n-paste from Makefile.am
-libpts_la_SOURCES := \
-	libpts.h libpts.c \
-	pts/pts.h pts/pts.c \
-	pts/pts_error.h pts/pts_error.c \
-	pts/pts_pcr.h pts/pts_pcr.c \
-	pts/pts_proto_caps.h \
-	pts/pts_req_func_comp_evid.h \
-	pts/pts_simple_evid_final.h \
-	pts/pts_creds.h pts/pts_creds.c \
-	pts/pts_database.h pts/pts_database.c \
-	pts/pts_dh_group.h pts/pts_dh_group.c \
-	pts/pts_file_meas.h pts/pts_file_meas.c \
-	pts/pts_file_meta.h pts/pts_file_meta.c \
-	pts/pts_file_type.h pts/pts_file_type.c \
-	pts/pts_ima_bios_list.h pts/pts_ima_bios_list.c \
-	pts/pts_ima_event_list.h pts/pts_ima_event_list.c \
-	pts/pts_meas_algo.h pts/pts_meas_algo.c \
-	pts/components/pts_component.h \
-	pts/components/pts_component_manager.h pts/components/pts_component_manager.c \
-	pts/components/pts_comp_evidence.h pts/components/pts_comp_evidence.c \
-	pts/components/pts_comp_func_name.h pts/components/pts_comp_func_name.c \
-	pts/components/ita/ita_comp_func_name.h pts/components/ita/ita_comp_func_name.c \
-	pts/components/ita/ita_comp_ima.h pts/components/ita/ita_comp_ima.c \
-	pts/components/ita/ita_comp_tboot.h pts/components/ita/ita_comp_tboot.c \
-	pts/components/ita/ita_comp_tgrub.h pts/components/ita/ita_comp_tgrub.c \
-	pts/components/tcg/tcg_comp_func_name.h pts/components/tcg/tcg_comp_func_name.c \
-	swid/swid_error.h swid/swid_error.c \
-	swid/swid_inventory.h swid/swid_inventory.c \
-	swid/swid_tag.h swid/swid_tag.c \
-	swid/swid_tag_id.h swid/swid_tag_id.c \
-	tcg/tcg_attr.h tcg/tcg_attr.c \
-	tcg/pts/tcg_pts_attr_proto_caps.h tcg/pts/tcg_pts_attr_proto_caps.c \
-	tcg/pts/tcg_pts_attr_dh_nonce_params_req.h tcg/pts/tcg_pts_attr_dh_nonce_params_req.c \
-	tcg/pts/tcg_pts_attr_dh_nonce_params_resp.h tcg/pts/tcg_pts_attr_dh_nonce_params_resp.c \
-	tcg/pts/tcg_pts_attr_dh_nonce_finish.h tcg/pts/tcg_pts_attr_dh_nonce_finish.c \
-	tcg/pts/tcg_pts_attr_meas_algo.h tcg/pts/tcg_pts_attr_meas_algo.c \
-	tcg/pts/tcg_pts_attr_get_tpm_version_info.h tcg/pts/tcg_pts_attr_get_tpm_version_info.c \
-	tcg/pts/tcg_pts_attr_tpm_version_info.h tcg/pts/tcg_pts_attr_tpm_version_info.c \
-	tcg/pts/tcg_pts_attr_get_aik.h tcg/pts/tcg_pts_attr_get_aik.c \
-	tcg/pts/tcg_pts_attr_aik.h tcg/pts/tcg_pts_attr_aik.c \
-	tcg/pts/tcg_pts_attr_req_func_comp_evid.h tcg/pts/tcg_pts_attr_req_func_comp_evid.c \
-	tcg/pts/tcg_pts_attr_gen_attest_evid.h tcg/pts/tcg_pts_attr_gen_attest_evid.c \
-	tcg/pts/tcg_pts_attr_simple_comp_evid.h tcg/pts/tcg_pts_attr_simple_comp_evid.c \
-	tcg/pts/tcg_pts_attr_simple_evid_final.h tcg/pts/tcg_pts_attr_simple_evid_final.c \
-	tcg/pts/tcg_pts_attr_req_file_meas.h tcg/pts/tcg_pts_attr_req_file_meas.c \
-	tcg/pts/tcg_pts_attr_file_meas.h tcg/pts/tcg_pts_attr_file_meas.c \
-	tcg/pts/tcg_pts_attr_req_file_meta.h tcg/pts/tcg_pts_attr_req_file_meta.c \
-	tcg/pts/tcg_pts_attr_unix_file_meta.h tcg/pts/tcg_pts_attr_unix_file_meta.c \
-	tcg/swid/tcg_swid_attr_req.h tcg/swid/tcg_swid_attr_req.c \
-	tcg/swid/tcg_swid_attr_tag_id_inv.h tcg/swid/tcg_swid_attr_tag_id_inv.c \
-	tcg/swid/tcg_swid_attr_tag_inv.h tcg/swid/tcg_swid_attr_tag_inv.c
-
-LOCAL_SRC_FILES := $(filter %.c,$(libpts_la_SOURCES))
-
-# build libpts -----------------------------------------------------------------
-
-LOCAL_C_INCLUDES += \
-	$(strongswan_PATH)/src/libtncif \
-	$(strongswan_PATH)/src/libimcv \
-	$(strongswan_PATH)/src/libstrongswan
-
-LOCAL_CFLAGS := $(strongswan_CFLAGS)
-
-LOCAL_MODULE := libpts
-
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_ARM_MODE := arm
-
-LOCAL_PRELINK_MODULE := false
-
-LOCAL_SHARED_LIBRARIES += libstrongswan libimcv
-
-include $(BUILD_SHARED_LIBRARY)
diff --git a/src/libpts/Makefile.am b/src/libpts/Makefile.am
deleted file mode 100644
index f047b5233..000000000
--- a/src/libpts/Makefile.am
+++ /dev/null
@@ -1,97 +0,0 @@
-AM_CPPFLAGS = \
-	-I$(top_srcdir)/src/libstrongswan \
-	-I$(top_srcdir)/src/libtncif \
-	-I$(top_srcdir)/src/libimcv
-
-AM_LDFLAGS = \
-	-no-undefined
-
-ipseclib_LTLIBRARIES = libpts.la
-
-libpts_la_LIBADD = \
-	$(top_builddir)/src/libstrongswan/libstrongswan.la \
-	$(top_builddir)/src/libtncif/libtncif.la \
-	$(top_builddir)/src/libimcv/libimcv.la
-
-if USE_WINDOWS
-  libpts_la_LIBADD += -lws2_32
-endif
-
-if USE_TROUSERS
-  libpts_la_LIBADD += -ltspi
-endif
-
-libpts_la_SOURCES = \
-	libpts.h libpts.c \
-	pts/pts.h pts/pts.c \
-	pts/pts_error.h pts/pts_error.c \
-	pts/pts_pcr.h pts/pts_pcr.c \
-	pts/pts_proto_caps.h \
-	pts/pts_req_func_comp_evid.h \
-	pts/pts_simple_evid_final.h \
-	pts/pts_creds.h pts/pts_creds.c \
-	pts/pts_database.h pts/pts_database.c \
-	pts/pts_dh_group.h pts/pts_dh_group.c \
-	pts/pts_file_meas.h pts/pts_file_meas.c \
-	pts/pts_file_meta.h pts/pts_file_meta.c \
-	pts/pts_file_type.h pts/pts_file_type.c \
-	pts/pts_ima_bios_list.h pts/pts_ima_bios_list.c \
-	pts/pts_ima_event_list.h pts/pts_ima_event_list.c \
-	pts/pts_meas_algo.h pts/pts_meas_algo.c \
-	pts/components/pts_component.h \
-	pts/components/pts_component_manager.h pts/components/pts_component_manager.c \
-	pts/components/pts_comp_evidence.h pts/components/pts_comp_evidence.c \
-	pts/components/pts_comp_func_name.h pts/components/pts_comp_func_name.c \
-	pts/components/ita/ita_comp_func_name.h pts/components/ita/ita_comp_func_name.c \
-	pts/components/ita/ita_comp_ima.h pts/components/ita/ita_comp_ima.c \
-	pts/components/ita/ita_comp_tboot.h pts/components/ita/ita_comp_tboot.c \
-	pts/components/ita/ita_comp_tgrub.h pts/components/ita/ita_comp_tgrub.c \
-	pts/components/tcg/tcg_comp_func_name.h pts/components/tcg/tcg_comp_func_name.c \
-	swid/swid_error.h swid/swid_error.c \
-	swid/swid_inventory.h swid/swid_inventory.c \
-	swid/swid_tag.h swid/swid_tag.c \
-	swid/swid_tag_id.h swid/swid_tag_id.c \
-	tcg/tcg_attr.h tcg/tcg_attr.c \
-	tcg/pts/tcg_pts_attr_proto_caps.h tcg/pts/tcg_pts_attr_proto_caps.c \
-	tcg/pts/tcg_pts_attr_dh_nonce_params_req.h tcg/pts/tcg_pts_attr_dh_nonce_params_req.c \
-	tcg/pts/tcg_pts_attr_dh_nonce_params_resp.h tcg/pts/tcg_pts_attr_dh_nonce_params_resp.c \
-	tcg/pts/tcg_pts_attr_dh_nonce_finish.h tcg/pts/tcg_pts_attr_dh_nonce_finish.c \
-	tcg/pts/tcg_pts_attr_meas_algo.h tcg/pts/tcg_pts_attr_meas_algo.c \
-	tcg/pts/tcg_pts_attr_get_tpm_version_info.h tcg/pts/tcg_pts_attr_get_tpm_version_info.c \
-	tcg/pts/tcg_pts_attr_tpm_version_info.h tcg/pts/tcg_pts_attr_tpm_version_info.c \
-	tcg/pts/tcg_pts_attr_get_aik.h tcg/pts/tcg_pts_attr_get_aik.c \
-	tcg/pts/tcg_pts_attr_aik.h tcg/pts/tcg_pts_attr_aik.c \
-	tcg/pts/tcg_pts_attr_req_func_comp_evid.h tcg/pts/tcg_pts_attr_req_func_comp_evid.c \
-	tcg/pts/tcg_pts_attr_gen_attest_evid.h tcg/pts/tcg_pts_attr_gen_attest_evid.c \
-	tcg/pts/tcg_pts_attr_simple_comp_evid.h tcg/pts/tcg_pts_attr_simple_comp_evid.c \
-	tcg/pts/tcg_pts_attr_simple_evid_final.h tcg/pts/tcg_pts_attr_simple_evid_final.c \
-	tcg/pts/tcg_pts_attr_req_file_meas.h tcg/pts/tcg_pts_attr_req_file_meas.c \
-	tcg/pts/tcg_pts_attr_file_meas.h tcg/pts/tcg_pts_attr_file_meas.c \
-	tcg/pts/tcg_pts_attr_req_file_meta.h tcg/pts/tcg_pts_attr_req_file_meta.c \
-	tcg/pts/tcg_pts_attr_unix_file_meta.h tcg/pts/tcg_pts_attr_unix_file_meta.c \
-	tcg/seg/tcg_seg_attr_max_size.h tcg/seg/tcg_seg_attr_max_size.c \
-	tcg/seg/tcg_seg_attr_seg_env.h tcg/seg/tcg_seg_attr_seg_env.c \
-	tcg/seg/tcg_seg_attr_next_seg.h tcg/seg/tcg_seg_attr_next_seg.c \
-	tcg/swid/tcg_swid_attr_req.h tcg/swid/tcg_swid_attr_req.c \
-	tcg/swid/tcg_swid_attr_tag_id_inv.h tcg/swid/tcg_swid_attr_tag_id_inv.c \
-	tcg/swid/tcg_swid_attr_tag_inv.h tcg/swid/tcg_swid_attr_tag_inv.c
-
-EXTRA_DIST = Android.mk
-
-SUBDIRS = .
-
-if USE_IMC_ATTESTATION
-  SUBDIRS += plugins/imc_attestation
-endif
-
-if USE_IMV_ATTESTATION
-  SUBDIRS += plugins/imv_attestation
-endif
-
-if USE_IMC_SWID
-  SUBDIRS += plugins/imc_swid
-endif
-
-if USE_IMV_SWID
-  SUBDIRS += plugins/imv_swid
-endif
diff --git a/src/libpts/libpts.c b/src/libpts/libpts.c
deleted file mode 100644
index 95110823c..000000000
--- a/src/libpts/libpts.c
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * Copyright (C) 2011 Andreas Steffen, HSR Hochschule fuer Technik Rapperswil
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 2 of the License, or (at your
- * option) any later version.  See <http://www.fsf.org/copyleft/gpl.txt>.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * for more details.
- */
-
-#include "libpts.h"
-#include "tcg/tcg_attr.h"
-#include "pts/components/pts_component.h"
-#include "pts/components/pts_component_manager.h"
-#include "pts/components/tcg/tcg_comp_func_name.h"
-#include "pts/components/ita/ita_comp_func_name.h"
-#include "pts/components/ita/ita_comp_ima.h"
-#include "pts/components/ita/ita_comp_tboot.h"
-#include "pts/components/ita/ita_comp_tgrub.h"
-
-#include <imcv.h>
-#include <utils/debug.h>
-
-/**
- * PTS Functional Component manager
- */
-pts_component_manager_t *pts_components;
-
-/**
- * Reference count for IMC/IMV instances
- */
-static refcount_t libpts_ref = 0;
-
-/**
- * Described in header.
- */
-bool libpts_init(void)
-{
-	if (libpts_ref == 0)
-	{
-		if (!imcv_pa_tnc_attributes)
-		{
-			return FALSE;
-		}
-		imcv_pa_tnc_attributes->add_vendor(imcv_pa_tnc_attributes, PEN_TCG,
-							tcg_attr_create_from_data, tcg_attr_names);
-
-		pts_components = pts_component_manager_create();
-		pts_components->add_vendor(pts_components, PEN_TCG,
-					pts_tcg_comp_func_names, PTS_TCG_QUALIFIER_TYPE_SIZE,
-					pts_tcg_qualifier_flag_names, pts_tcg_qualifier_type_names);
-		pts_components->add_vendor(pts_components, PEN_ITA,
-					pts_ita_comp_func_names, PTS_ITA_QUALIFIER_TYPE_SIZE,
-					pts_ita_qualifier_flag_names, pts_ita_qualifier_type_names);
-
-		pts_components->add_component(pts_components, PEN_ITA,
-									  PTS_ITA_COMP_FUNC_NAME_TGRUB,
-									  pts_ita_comp_tgrub_create);
-		pts_components->add_component(pts_components, PEN_ITA,
-									  PTS_ITA_COMP_FUNC_NAME_TBOOT,
-									  pts_ita_comp_tboot_create);
-		pts_components->add_component(pts_components, PEN_ITA,
-									  PTS_ITA_COMP_FUNC_NAME_IMA,
-									  pts_ita_comp_ima_create);
-
-		DBG1(DBG_LIB, "libpts initialized");
-	}
-	ref_get(&libpts_ref);
-
-	return TRUE;
-}
-
-/**
- * Described in header.
- */
-void libpts_deinit(void)
-{
-	if (ref_put(&libpts_ref))
-	{
-		pts_components->remove_vendor(pts_components, PEN_TCG);
-		pts_components->remove_vendor(pts_components, PEN_ITA);
-		pts_components->destroy(pts_components);
-
-		if (!imcv_pa_tnc_attributes)
-		{
-			return;
-		}
-		imcv_pa_tnc_attributes->remove_vendor(imcv_pa_tnc_attributes, PEN_TCG);
-		DBG1(DBG_LIB, "libpts terminated");
-	}
-}
-
diff --git a/src/libpts/libpts.h b/src/libpts/libpts.h
deleted file mode 100644
index e3814e97d..000000000
--- a/src/libpts/libpts.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (C) 2011 Andreas Steffen, HSR Hochschule fuer Technik Rapperswil
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 2 of the License, or (at your
- * option) any later version.  See <http://www.fsf.org/copyleft/gpl.txt>.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * for more details.
- */
-
-/**
- * @defgroup libpts libpts
- *
- * @defgroup libpts_plugins plugins
- * @ingroup libpts
- *
- * @defgroup swid swid
- * @ingroup libpts
- *
- * @addtogroup libpts
- * @{
- */
-
-#ifndef LIBPTS_H_
-#define LIBPTS_H_
-
-#include "pts/components/pts_component_manager.h"
-
-#include <library.h>
-
-/**
- * Initialize libpts.
- *
- * @return			FALSE if initialization failed
- */
-bool libpts_init(void);
-
-/**
- * Deinitialize libpts.
- */
-void libpts_deinit(void);
-
-/**
- * PTS Functional Component manager
- */
-extern pts_component_manager_t* pts_components;
-
-#endif /** LIBPTS_H_ @}*/