From 9cd7f384ba15153775d62cf5aaea329b647b8c3d Mon Sep 17 00:00:00 2001
From: Martin Willi <martin@revosec.ch>
Date: Thu, 12 May 2011 10:33:48 +0200
Subject: [PATCH] Include library.h in plugin.h

---
 src/libcharon/daemon.c                     | 1 +
 src/libcharon/plugins/stroke/stroke_list.c | 1 +
 src/libstrongswan/integrity_checker.h      | 1 -
 src/libstrongswan/library.h                | 2 +-
 src/libstrongswan/plugins/plugin.h         | 1 +
 src/scepclient/scepclient.c                | 1 +
 6 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/libcharon/daemon.c b/src/libcharon/daemon.c
index f21a7951c..a108cd4ef 100644
--- a/src/libcharon/daemon.c
+++ b/src/libcharon/daemon.c
@@ -34,6 +34,7 @@
 #include "daemon.h"
 
 #include <library.h>
+#include <plugins/plugin.h>
 #include <config/proposal.h>
 #include <kernel/kernel_handler.h>
 #include <processing/jobs/start_action_job.h>
diff --git a/src/libcharon/plugins/stroke/stroke_list.c b/src/libcharon/plugins/stroke/stroke_list.c
index cbe10e152..485c7b313 100644
--- a/src/libcharon/plugins/stroke/stroke_list.c
+++ b/src/libcharon/plugins/stroke/stroke_list.c
@@ -25,6 +25,7 @@
 #include <hydra.h>
 #include <daemon.h>
 #include <utils/linked_list.h>
+#include <plugins/plugin.h>
 #include <credentials/certificates/x509.h>
 #include <credentials/certificates/ac.h>
 #include <credentials/certificates/crl.h>
diff --git a/src/libstrongswan/integrity_checker.h b/src/libstrongswan/integrity_checker.h
index 55a4658f7..891ccccf7 100644
--- a/src/libstrongswan/integrity_checker.h
+++ b/src/libstrongswan/integrity_checker.h
@@ -22,7 +22,6 @@
 #define INTEGRITY_CHECKER_H_
 
 #include "utils.h"
-#include "plugins/plugin.h"
 
 typedef struct integrity_checker_t integrity_checker_t;
 typedef struct integrity_checksum_t integrity_checksum_t;
diff --git a/src/libstrongswan/library.h b/src/libstrongswan/library.h
index 85e61de4b..7e76e1927 100644
--- a/src/libstrongswan/library.h
+++ b/src/libstrongswan/library.h
@@ -72,7 +72,6 @@
 #include "chunk.h"
 #include "settings.h"
 #include "integrity_checker.h"
-#include "plugins/plugin_loader.h"
 #include "processing/processor.h"
 #include "processing/scheduler.h"
 #include "crypto/crypto_factory.h"
@@ -82,6 +81,7 @@
 #include "credentials/credential_manager.h"
 #include "credentials/cred_encoding.h"
 #include "utils/leak_detective.h"
+#include "plugins/plugin_loader.h"
 
 typedef struct library_t library_t;
 
diff --git a/src/libstrongswan/plugins/plugin.h b/src/libstrongswan/plugins/plugin.h
index 3626f45f7..c0150487c 100644
--- a/src/libstrongswan/plugins/plugin.h
+++ b/src/libstrongswan/plugins/plugin.h
@@ -22,6 +22,7 @@
 #define PLUGIN_H_
 
 #include "../utils.h"
+#include <library.h>
 
 typedef struct plugin_t plugin_t;
 
diff --git a/src/scepclient/scepclient.c b/src/scepclient/scepclient.c
index e91b3f5c0..6e7125b74 100644
--- a/src/scepclient/scepclient.c
+++ b/src/scepclient/scepclient.c
@@ -50,6 +50,7 @@
 #include <credentials/certificates/certificate.h>
 #include <credentials/certificates/x509.h>
 #include <credentials/certificates/pkcs10.h>
+#include <plugins/plugin.h>
 
 #include "../pluto/constants.h"
 #include "../pluto/defs.h"