11 files changed, 30 insertions, 17 deletions
diff --git a/src/libimcv/Makefile.am b/src/libimcv/Makefile.am
index 4df819db6..ffce14a7d 100644
--- a/src/libimcv/Makefile.am
+++ b/src/libimcv/Makefile.am
@@ -1,8 +1,10 @@
 
-INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libcharon
+INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libtncif
 
 noinst_LTLIBRARIES = libimcv.la
 
+libimcv_la_LIBADD = $(top_builddir)/src/libtncif/libtncif.la
+
 libimcv_la_SOURCES = \
 	imc/imc_agent.h imc/imc_agent.c imc/imc_state.h \
 	imv/imv_agent.h imv/imv_agent.c imv/imv_state.h \
diff --git a/src/libimcv/imc/imc_agent.h b/src/libimcv/imc/imc_agent.h
index 1112fb37f..7c7ef732b 100644
--- a/src/libimcv/imc/imc_agent.h
+++ b/src/libimcv/imc/imc_agent.h
@@ -23,8 +23,9 @@
 
 #include "imc_state.h"
 
-#include <tnc/tncifimc.h>
-#include <tnc/pen/pen.h>
+#include <tncifimc.h>
+#include <pen/pen.h>
+
 #include <library.h>
 
 typedef struct imc_agent_t imc_agent_t;
diff --git a/src/libimcv/imc/imc_state.h b/src/libimcv/imc/imc_state.h
index 9d46a57b2..73013f8ce 100644
--- a/src/libimcv/imc/imc_state.h
+++ b/src/libimcv/imc/imc_state.h
@@ -21,7 +21,8 @@
 #ifndef IMC_STATE_H_
 #define IMC_STATE_H_
 
-#include <tnc/tncif.h>
+#include <tncif.h>
+
 #include <library.h>
 
 typedef struct imc_state_t imc_state_t;
diff --git a/src/libimcv/imv/imv_agent.h b/src/libimcv/imv/imv_agent.h
index 04f113474..d0816b3ad 100644
--- a/src/libimcv/imv/imv_agent.h
+++ b/src/libimcv/imv/imv_agent.h
@@ -23,8 +23,9 @@
 
 #include "imv_state.h"
 
-#include <tnc/tncifimv.h>
-#include <tnc/pen/pen.h>
+#include <tncifimv.h>
+#include <pen/pen.h>
+
 #include <library.h>
 
 typedef struct imv_agent_t imv_agent_t;
diff --git a/src/libimcv/imv/imv_state.h b/src/libimcv/imv/imv_state.h
index dcf7af6bb..a2559643f 100644
--- a/src/libimcv/imv/imv_state.h
+++ b/src/libimcv/imv/imv_state.h
@@ -21,7 +21,8 @@
 #ifndef IMV_STATE_H_
 #define IMV_STATE_H_
 
-#include <tnc/tncifimv.h>
+#include <tncifimv.h>
+
 #include <library.h>
 
 typedef struct imv_state_t imv_state_t;
diff --git a/src/libimcv/ita/ita_attr_command.c b/src/libimcv/ita/ita_attr_command.c
index 33f97a1a9..d8c18b55c 100644
--- a/src/libimcv/ita/ita_attr_command.c
+++ b/src/libimcv/ita/ita_attr_command.c
@@ -14,7 +14,8 @@
 
 #include "ita_attr_command.h"
 
-#include <tnc/pen/pen.h>
+#include <pen/pen.h>
+
 #include <debug.h>
 
 typedef struct private_ita_attr_command_t private_ita_attr_command_t;
diff --git a/src/libimcv/pa_tnc/pa_tnc_attr.h b/src/libimcv/pa_tnc/pa_tnc_attr.h
index b594a4608..c1ef6d52a 100644
--- a/src/libimcv/pa_tnc/pa_tnc_attr.h
+++ b/src/libimcv/pa_tnc/pa_tnc_attr.h
@@ -24,7 +24,7 @@
 typedef struct pa_tnc_attr_t pa_tnc_attr_t;
 
 #include <library.h>
-#include <tnc/pen/pen.h>
+#include <pen/pen.h>
 
 /**
  * Interface for an RFC 5792 PA-TNC Posture Attribute.
diff --git a/src/libimcv/plugins/imc_test/Makefile.am b/src/libimcv/plugins/imc_test/Makefile.am
index ffad4e445..893d32a00 100644
--- a/src/libimcv/plugins/imc_test/Makefile.am
+++ b/src/libimcv/plugins/imc_test/Makefile.am
@@ -1,12 +1,13 @@
 
-INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libhydra \
-	-I$(top_srcdir)/src/libcharon -I$(top_srcdir)/src/libimcv
+INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libtncif \
+	-I$(top_srcdir)/src/libimcv
 
 AM_CFLAGS = -rdynamic
 
 plugin_LTLIBRARIES = libstrongswan-imc-test.la
 
-libstrongswan_imc_test_la_LIBADD = $(top_builddir)/src/libimcv/libimcv.la
+libstrongswan_imc_test_la_LIBADD = $(top_builddir)/src/libimcv/libimcv.la \
+	$(top_builddir)/src/libstrongswan/libstrongswan.la
 
 libstrongswan_imc_test_la_SOURCES = imc_test.c \
 	imc_test_state.h imc_test_state.c
diff --git a/src/libimcv/plugins/imc_test/imc_test.c b/src/libimcv/plugins/imc_test/imc_test.c
index ad5d3b059..752a66ef5 100644
--- a/src/libimcv/plugins/imc_test/imc_test.c
+++ b/src/libimcv/plugins/imc_test/imc_test.c
@@ -17,7 +17,9 @@
 #include <imc/imc_agent.h>
 #include <pa_tnc/pa_tnc_msg.h>
 #include <ita/ita_attr_command.h>
-#include <tnc/pen/pen.h>
+
+#include <pen/pen.h>
+
 #include <debug.h>
 
 /* IMC definitions */
diff --git a/src/libimcv/plugins/imv_test/Makefile.am b/src/libimcv/plugins/imv_test/Makefile.am
index 59a6cc806..a3a3c1d37 100644
--- a/src/libimcv/plugins/imv_test/Makefile.am
+++ b/src/libimcv/plugins/imv_test/Makefile.am
@@ -1,12 +1,13 @@
 
-INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libhydra \
-	-I$(top_srcdir)/src/libcharon -I$(top_srcdir)/src/libimcv
+INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libtncif \
+	-I$(top_srcdir)/src/libimcv
 
 AM_CFLAGS = -rdynamic
 
 plugin_LTLIBRARIES = libstrongswan-imv-test.la
 
-libstrongswan_imv_test_la_LIBADD = $(top_builddir)/src/libimcv/libimcv.la
+libstrongswan_imv_test_la_LIBADD = $(top_builddir)/src/libimcv/libimcv.la \
+	$(top_builddir)/src/libstrongswan/libstrongswan.la
 
 libstrongswan_imv_test_la_SOURCES = imv_test.c \
 	imv_test_state.h imv_test_state.c
diff --git a/src/libimcv/plugins/imv_test/imv_test.c b/src/libimcv/plugins/imv_test/imv_test.c
index 92605d136..a6540c1cb 100644
--- a/src/libimcv/plugins/imv_test/imv_test.c
+++ b/src/libimcv/plugins/imv_test/imv_test.c
@@ -17,7 +17,9 @@
 #include <imv/imv_agent.h>
 #include <pa_tnc/pa_tnc_msg.h>
 #include <ita/ita_attr_command.h>
-#include <tnc/pen/pen.h>
+
+#include <pen/pen.h>
+
 #include <debug.h>
 
 /* IMV definitions */