Moved debug.[ch] to utils folder

scripts/dh_speed.c

@@ -16,7 +16,7 @@
 #include <stdio.h>
 #include <time.h>
 #include <library.h>
-#include <debug.h>
+#include <utils/debug.h>
 #include <crypto/diffie_hellman.h>
 
 static void usage()

scripts/fetch.c

@@ -17,7 +17,7 @@
 #include <unistd.h>
 
 #include <library.h>
-#include <debug.h>
+#include <utils/debug.h>
 
 static int count = 0;
 

scripts/key2keyid.c

@@ -15,7 +15,7 @@
 
 #include <stdio.h>
 #include <library.h>
-#include <debug.h>
+#include <utils/debug.h>
 #include <credentials/keys/private_key.h>
 #include <credentials/keys/public_key.h>
 

scripts/keyid2sql.c

@@ -15,7 +15,7 @@
 
 #include <stdio.h>
 #include <library.h>
-#include <debug.h>
+#include <utils/debug.h>
 #include <credentials/keys/private_key.h>
 #include <credentials/keys/public_key.h>
 

scripts/pubkey_speed.c

@@ -2,7 +2,7 @@
 #include <stdio.h>
 #include <time.h>
 #include <library.h>
-#include <debug.h>
+#include <utils/debug.h>
 #include <credentials/keys/private_key.h>
 
 void start_timing(struct timespec *start)

scripts/tls_test.c

@@ -22,7 +22,7 @@
 #include <string.h>
 
 #include <library.h>
-#include <debug.h>
+#include <utils/debug.h>
 #include <tls_socket.h>
 #include <networking/host.h>
 #include <credentials/sets/mem_cred.h>

src/dumm/bridge.c

@@ -16,7 +16,7 @@
 #include <sys/types.h>
 #include <libbridge.h>
 
-#include <debug.h>
+#include <utils/debug.h>
 #include <collections/linked_list.h>
 
 #include "bridge.h"

src/dumm/cowfs.c

@@ -34,7 +34,7 @@
 #include "cowfs.h"
 
 #include <library.h>
-#include <debug.h>
+#include <utils/debug.h>
 #include <threading/thread.h>
 #include <threading/rwlock.h>
 #include <collections/linked_list.h>

src/dumm/dumm.c

@@ -23,7 +23,7 @@
 #include <dirent.h>
 #include <errno.h>
 
-#include <debug.h>
+#include <utils/debug.h>
 #include <collections/linked_list.h>
 
 #include "dumm.h"

src/dumm/ext/dumm.c

@@ -21,7 +21,7 @@
 
 #include <library.h>
 #include <dumm.h>
-#include <debug.h>
+#include <utils/debug.h>
 #include <collections/linked_list.h>
 
 #undef PACKAGE_NAME

src/dumm/guest.c

@@ -28,7 +28,7 @@
 #include <termios.h>
 #include <stdarg.h>
 
-#include <debug.h>
+#include <utils/debug.h>
 #include <collections/linked_list.h>
 
 #include "dumm.h"

src/dumm/iface.c

@@ -25,7 +25,7 @@
 #include <sys/ioctl.h>
 #include <linux/if_tun.h>
 
-#include <debug.h>
+#include <utils/debug.h>
 #include <collections/linked_list.h>
 
 #include "iface.h"

src/dumm/mconsole.c

@@ -25,7 +25,7 @@
 #include <errno.h>
 #include <sys/un.h>
 
-#include <debug.h>
+#include <utils/debug.h>
 
 #include "mconsole.h"
 

src/frontends/android/jni/libandroidbridge/backend/android_attr.c

@@ -19,7 +19,7 @@
 #include "../charonservice.h"
 
 #include <hydra.h>
-#include <debug.h>
+#include <utils/debug.h>
 #include <library.h>
 
 typedef struct private_android_attr_t private_android_attr_t;

src/frontends/android/jni/libandroidbridge/backend/android_private_key.c

@@ -16,7 +16,7 @@
 #include "android_private_key.h"
 
 #include "../android_jni.h"
-#include <debug.h>
+#include <utils/debug.h>
 
 typedef struct private_private_key_t private_private_key_t;
 

src/frontends/android/jni/libandroidbridge/kernel/android_ipsec.c

@@ -17,7 +17,7 @@
 #include "android_ipsec.h"
 #include "../charonservice.h"
 
-#include <debug.h>
+#include <utils/debug.h>
 #include <library.h>
 #include <hydra.h>
 #include <ipsec.h>

src/frontends/android/jni/libandroidbridge/kernel/android_net.c

@@ -16,7 +16,7 @@
 
 #include "../charonservice.h"
 #include <hydra.h>
-#include <debug.h>
+#include <utils/debug.h>
 #include <processing/jobs/callback_job.h>
 #include <threading/mutex.h>
 

src/frontends/android/jni/libandroidbridge/kernel/network_manager.c

@@ -16,7 +16,7 @@
 
 #include "../android_jni.h"
 #include "../charonservice.h"
-#include <debug.h>
+#include <utils/debug.h>
 #include <threading/mutex.h>
 
 typedef struct private_network_manager_t private_network_manager_t;

src/frontends/android/jni/libandroidbridge/vpnservice_builder.c

@@ -18,7 +18,7 @@
 #include "vpnservice_builder.h"
 #include "android_jni.h"
 
-#include <debug.h>
+#include <utils/debug.h>
 #include <library.h>
 
 typedef struct private_vpnservice_builder_t private_vpnservice_builder_t;

src/libcharon/bus/bus.h

@@ -28,7 +28,7 @@ typedef struct bus_t bus_t;
 
 #include <stdarg.h>
 
-#include <debug.h>
+#include <utils/debug.h>
 #include <sa/ike_sa.h>
 #include <sa/child_sa.h>
 #include <processing/jobs/job.h>

src/libcharon/plugins/addrblock/addrblock_validator.c

@@ -15,7 +15,7 @@
 
 #include "addrblock_validator.h"
 
-#include <debug.h>
+#include <utils/debug.h>
 #include <credentials/certificates/x509.h>
 #include <selectors/traffic_selector.h>
 

src/libcharon/plugins/certexpire/certexpire_cron.c

@@ -17,7 +17,7 @@
 
 #include <time.h>
 
-#include <debug.h>
+#include <utils/debug.h>
 #include <processing/jobs/callback_job.h>
 
 typedef struct private_certexpire_cron_t private_certexpire_cron_t;

src/libcharon/plugins/certexpire/certexpire_export.c

@@ -21,7 +21,7 @@
 #include <limits.h>
 #include <errno.h>
 
-#include <debug.h>
+#include <utils/debug.h>
 #include <daemon.h>
 #include <collections/hashtable.h>
 #include <threading/mutex.h>

src/libcharon/plugins/eap_peap/eap_peap_avp.c

@@ -16,7 +16,7 @@
 #include "eap_peap_avp.h"
 
 #include <eap/eap.h>
-#include <debug.h>
+#include <utils/debug.h>
 
 /**
  * Microsoft Success and Failure Result AVPs

src/libcharon/plugins/eap_peap/eap_peap_peer.c

@@ -16,7 +16,7 @@
 #include "eap_peap_peer.h"
 #include "eap_peap_avp.h"
 
-#include <debug.h>
+#include <utils/debug.h>
 #include <daemon.h>
 
 typedef struct private_eap_peap_peer_t private_eap_peap_peer_t;

src/libcharon/plugins/eap_peap/eap_peap_server.c

@@ -16,7 +16,7 @@
 #include "eap_peap_server.h"
 #include "eap_peap_avp.h"
 
-#include <debug.h>
+#include <utils/debug.h>
 #include <daemon.h>
 
 typedef struct private_eap_peap_server_t private_eap_peap_server_t;

src/libcharon/plugins/eap_simaka_pseudonym/eap_simaka_pseudonym_provider.c

@@ -15,7 +15,7 @@
 
 #include "eap_simaka_pseudonym_provider.h"
 
-#include <debug.h>
+#include <utils/debug.h>
 #include <collections/hashtable.h>
 
 typedef struct private_eap_simaka_pseudonym_provider_t private_eap_simaka_pseudonym_provider_t;

src/libcharon/plugins/eap_tnc/eap_tnc.c

@@ -18,7 +18,7 @@
 #include <tnc/tnc.h>
 #include <tnc/tnccs/tnccs_manager.h>
 #include <tls_eap.h>
-#include <debug.h>
+#include <utils/debug.h>
 #include <daemon.h>
 
 /**

src/libcharon/plugins/eap_ttls/eap_ttls_avp.c

@@ -15,7 +15,7 @@
 
 #include "eap_ttls_avp.h"
 
-#include <debug.h>
+#include <utils/debug.h>
 
 #define AVP_EAP_MESSAGE		79
 #define AVP_HEADER_LEN		 8

src/libcharon/plugins/eap_ttls/eap_ttls_peer.c

@@ -16,7 +16,7 @@
 #include "eap_ttls_peer.h"
 #include "eap_ttls_avp.h"
 
-#include <debug.h>
+#include <utils/debug.h>
 #include <daemon.h>
 #include <radius_message.h>
 #include <sa/eap/eap_method.h>

src/libcharon/plugins/eap_ttls/eap_ttls_server.c

@@ -16,7 +16,7 @@
 #include "eap_ttls_server.h"
 #include "eap_ttls_avp.h"
 
-#include <debug.h>
+#include <utils/debug.h>
 #include <daemon.h>
 
 #include <sa/eap/eap_method.h>

src/libcharon/plugins/tnc_ifmap/tnc_ifmap_listener.c

@@ -18,7 +18,7 @@
 
 #include <daemon.h>
 #include <hydra.h>
-#include <debug.h>
+#include <utils/debug.h>
 
 typedef struct private_tnc_ifmap_listener_t private_tnc_ifmap_listener_t;
 

src/libcharon/plugins/tnc_ifmap/tnc_ifmap_soap.c

@@ -15,7 +15,7 @@
 
 #include "tnc_ifmap_soap.h"
 
-#include <debug.h>
+#include <utils/debug.h>
 #include <daemon.h>
 
 #include <axis2_util.h>

src/libcharon/plugins/tnc_imc/tnc_imc.c

@@ -20,7 +20,7 @@
 
 #include <tncif_pa_subtypes.h>
 
-#include <debug.h>
+#include <utils/debug.h>
 #include <library.h>
 #include <collections/linked_list.h>
 #include <threading/mutex.h>

src/libcharon/plugins/tnc_imc/tnc_imc_bind_function.c

@@ -17,7 +17,7 @@
 #include <tnc/imc/imc_manager.h>
 #include <tnc/tnccs/tnccs_manager.h>
 
-#include <debug.h>
+#include <utils/debug.h>
 
 /**
  * Called by the IMC to inform a TNCC about the set of message types the IMC

src/libcharon/plugins/tnc_imc/tnc_imc_manager.c

@@ -20,7 +20,7 @@
 #include <tncifimc.h>
 
 #include <collections/linked_list.h>
-#include <debug.h>
+#include <utils/debug.h>
 #include <daemon.h>
 
 typedef struct private_tnc_imc_manager_t private_tnc_imc_manager_t;

src/libcharon/plugins/tnc_imv/tnc_imv.c

@@ -20,7 +20,7 @@
 
 #include <tncif_pa_subtypes.h>
 
-#include <debug.h>
+#include <utils/debug.h>
 #include <library.h>
 #include <collections/linked_list.h>
 #include <threading/mutex.h>

src/libcharon/plugins/tnc_imv/tnc_imv_bind_function.c

@@ -18,7 +18,7 @@
 #include <tnc/imv/imv_manager.h>
 #include <tnc/tnccs/tnccs_manager.h>
 
-#include <debug.h>
+#include <utils/debug.h>
 
 /**
  * Called by the IMV to inform a TNCS about the set of message types the IMV

src/libcharon/plugins/tnc_imv/tnc_imv_manager.c

@@ -30,7 +30,7 @@
 
 #include <daemon.h>
 #include <utils/lexparser.h>
-#include <debug.h>
+#include <utils/debug.h>
 #include <threading/mutex.h>
 
 typedef struct private_tnc_imv_manager_t private_tnc_imv_manager_t;

src/libcharon/plugins/tnc_imv/tnc_imv_recommendations.c

@@ -21,7 +21,7 @@
 #include <tnc/imv/imv_manager.h>
 #include <tnc/imv/imv_recommendations.h>
 
-#include <debug.h>
+#include <utils/debug.h>
 #include <collections/linked_list.h>
 
 typedef struct private_tnc_imv_recommendations_t private_tnc_imv_recommendations_t;

src/libcharon/plugins/tnc_pdp/tnc_pdp.c

@@ -23,7 +23,7 @@
 #include <radius_mppe.h>
 
 #include <daemon.h>
-#include <debug.h>
+#include <utils/debug.h>
 #include <pen/pen.h>
 #include <threading/thread.h>
 #include <processing/jobs/callback_job.h>

src/libcharon/plugins/tnc_pdp/tnc_pdp_connections.c

@@ -16,7 +16,7 @@
 #include "tnc_pdp_connections.h"
 
 #include <collections/linked_list.h>
-#include <debug.h>
+#include <utils/debug.h>
 
 typedef struct private_tnc_pdp_connections_t private_tnc_pdp_connections_t;
 typedef struct entry_t entry_t;

src/libcharon/plugins/tnc_tnccs/tnc_tnccs_manager.c

@@ -20,7 +20,7 @@
 #include <tnc/imc/imc_manager.h>
 #include <tnc/imv/imv_manager.h>
 
-#include <debug.h>
+#include <utils/debug.h>
 #include <collections/linked_list.h>
 #include <threading/rwlock.h>
 

src/libcharon/plugins/tnc_tnccs/tnc_tnccs_plugin.c

@@ -18,7 +18,7 @@
 
 #include <tnc/tnc.h>
 
-#include <debug.h>
+#include <utils/debug.h>
 
 typedef struct private_tnc_tnccs_plugin_t private_tnc_tnccs_plugin_t;
 

src/libcharon/plugins/tnccs_11/batch/tnccs_batch.c

@@ -19,7 +19,7 @@
 #include <tnc/tnccs/tnccs.h>
 
 #include <collections/linked_list.h>
-#include <debug.h>
+#include <utils/debug.h>
 
 #include <libxml/parser.h>
 

src/libcharon/plugins/tnccs_11/messages/imc_imv_msg.c

@@ -18,7 +18,7 @@
 #include <tnc/tnccs/tnccs.h>
 
 #include <utils/lexparser.h>
-#include <debug.h>
+#include <utils/debug.h>
 
 typedef struct private_imc_imv_msg_t private_imc_imv_msg_t;
 

src/libcharon/plugins/tnccs_11/messages/tnccs_error_msg.c

@@ -15,7 +15,7 @@
 
 #include "tnccs_error_msg.h"
 
-#include <debug.h>
+#include <utils/debug.h>
 
 ENUM(tnccs_error_type_names, TNCCS_ERROR_BATCH_TOO_LONG, TNCCS_ERROR_OTHER,
 	"batch-too-long",

src/libcharon/plugins/tnccs_11/messages/tnccs_msg.c

@@ -22,7 +22,7 @@
 #include "tnccs_tncs_contact_info_msg.h"
 
 #include <library.h>
-#include <debug.h>
+#include <utils/debug.h>
 
 ENUM(tnccs_msg_type_names, IMC_IMV_MSG, TNCCS_MSG_ROOF,
 	"IMC-IMV",

src/libcharon/plugins/tnccs_11/messages/tnccs_preferred_language_msg.c

@@ -15,7 +15,7 @@
 
 #include "tnccs_preferred_language_msg.h"
 
-#include <debug.h>
+#include <utils/debug.h>
 
 typedef struct private_tnccs_preferred_language_msg_t private_tnccs_preferred_language_msg_t;
 

src/libcharon/plugins/tnccs_11/messages/tnccs_reason_strings_msg.c

@@ -16,7 +16,7 @@
 #include "tnccs_reason_strings_msg.h"
 #include "tnccs_error_msg.h"
 
-#include <debug.h>
+#include <utils/debug.h>
 
 typedef struct private_tnccs_reason_strings_msg_t private_tnccs_reason_strings_msg_t;
 

src/libcharon/plugins/tnccs_11/messages/tnccs_recommendation_msg.c

@@ -16,7 +16,7 @@
 #include "tnccs_recommendation_msg.h"
 #include "tnccs_error_msg.h"
 
-#include <debug.h>
+#include <utils/debug.h>
 
 typedef struct private_tnccs_recommendation_msg_t private_tnccs_recommendation_msg_t;
 

src/libcharon/plugins/tnccs_11/messages/tnccs_tncs_contact_info_msg.c

@@ -14,7 +14,7 @@
 
 #include "tnccs_tncs_contact_info_msg.h"
 
-#include <debug.h>
+#include <utils/debug.h>
 
 typedef struct private_tnccs_tncs_contact_info_msg_t private_tnccs_tncs_contact_info_msg_t;
 

src/libcharon/plugins/tnccs_11/tnccs_11.c

@@ -31,7 +31,7 @@
 #include <tnc/tnccs/tnccs.h>
 #include <tnc/tnccs/tnccs_manager.h>
 
-#include <debug.h>
+#include <utils/debug.h>
 #include <daemon.h>
 #include <threading/mutex.h>
 

src/libcharon/plugins/tnccs_20/batch/pb_tnc_batch.c

@@ -24,7 +24,7 @@
 #include <bio/bio_writer.h>
 #include <bio/bio_reader.h>
 #include <pen/pen.h>
-#include <debug.h>
+#include <utils/debug.h>
 
 ENUM(pb_tnc_batch_type_names, PB_BATCH_CDATA, PB_BATCH_CLOSE,
 	"CDATA",

src/libcharon/plugins/tnccs_20/messages/pb_access_recommendation_msg.c

@@ -17,7 +17,7 @@
 
 #include <bio/bio_writer.h>
 #include <bio/bio_reader.h>
-#include <debug.h>
+#include <utils/debug.h>
 
 ENUM(pb_access_recommendation_code_names, PB_REC_ACCESS_ALLOWED, PB_REC_QUARANTINED,
 	"Access Allowed",

src/libcharon/plugins/tnccs_20/messages/pb_assessment_result_msg.c

@@ -19,7 +19,7 @@
 
 #include <bio/bio_writer.h>
 #include <bio/bio_reader.h>
-#include <debug.h>
+#include <utils/debug.h>
 
 typedef struct private_pb_assessment_result_msg_t private_pb_assessment_result_msg_t;
 

src/libcharon/plugins/tnccs_20/messages/pb_error_msg.c

@@ -20,7 +20,7 @@
 #include <bio/bio_writer.h>
 #include <bio/bio_reader.h>
 #include <pen/pen.h>
-#include <debug.h>
+#include <utils/debug.h>
 
 ENUM(pb_tnc_error_code_names, PB_ERROR_UNEXPECTED_BATCH_TYPE,
 							  PB_ERROR_VERSION_NOT_SUPPORTED,

src/libcharon/plugins/tnccs_20/messages/pb_language_preference_msg.c

@@ -17,7 +17,7 @@
 
 #include <bio/bio_writer.h>
 #include <bio/bio_reader.h>
-#include <debug.h>
+#include <utils/debug.h>
 
 typedef struct private_pb_language_preference_msg_t private_pb_language_preference_msg_t;
 

src/libcharon/plugins/tnccs_20/messages/pb_pa_msg.c

@@ -22,7 +22,7 @@
 #include <bio/bio_writer.h>
 #include <bio/bio_reader.h>
 #include <pen/pen.h>
-#include <debug.h>
+#include <utils/debug.h>
 
 typedef struct private_pb_pa_msg_t private_pb_pa_msg_t;
 

src/libcharon/plugins/tnccs_20/messages/pb_reason_string_msg.c

@@ -17,7 +17,7 @@
 
 #include <bio/bio_writer.h>
 #include <bio/bio_reader.h>
-#include <debug.h>
+#include <utils/debug.h>
 
 typedef struct private_pb_reason_string_msg_t private_pb_reason_string_msg_t;
 

src/libcharon/plugins/tnccs_20/messages/pb_remediation_parameters_msg.c

@@ -17,7 +17,7 @@
 
 #include <bio/bio_writer.h>
 #include <bio/bio_reader.h>
-#include <debug.h>
+#include <utils/debug.h>
 
 ENUM(pb_tnc_remed_param_type_names, PB_REMEDIATION_URI, PB_REMEDIATION_STRING,
 	"Remediation-URI",

src/libcharon/plugins/tnccs_20/state_machine/pb_tnc_state_machine.c

@@ -15,7 +15,7 @@
 
 #include "pb_tnc_state_machine.h"
 
-#include <debug.h>
+#include <utils/debug.h>
 
 ENUM(pb_tnc_state_names, PB_STATE_INIT, PB_STATE_END,
 	"Init",

src/libcharon/plugins/tnccs_20/tnccs_20.c

@@ -34,7 +34,7 @@
 #include <tnc/imc/imc_manager.h>
 #include <tnc/imv/imv_manager.h>
 
-#include <debug.h>
+#include <utils/debug.h>
 #include <daemon.h>
 #include <threading/mutex.h>
 #include <collections/linked_list.h>

src/libcharon/plugins/tnccs_dynamic/tnccs_dynamic.c

@@ -17,7 +17,7 @@
 
 #include <tnc/tnc.h>
 
-#include <debug.h>
+#include <utils/debug.h>
 
 typedef struct private_tnccs_dynamic_t private_tnccs_dynamic_t;
 

src/libfast/dispatcher.c

@@ -22,7 +22,7 @@
 #include <signal.h>
 #include <unistd.h>
 
-#include <debug.h>
+#include <utils/debug.h>
 #include <threading/thread.h>
 #include <threading/condvar.h>
 #include <threading/mutex.h>

src/libfast/request.c

@@ -18,7 +18,7 @@
 #include "request.h"
 
 #include <library.h>
-#include <debug.h>
+#include <utils/debug.h>
 #include <stdlib.h>
 #include <pthread.h>
 #include <string.h>

src/libfast/smtp.c

@@ -18,7 +18,7 @@
 #include <unistd.h>
 #include <errno.h>
 
-#include <debug.h>
+#include <utils/debug.h>
 
 typedef struct private_smtp_t private_smtp_t;
 

src/libhydra/attributes/attribute_manager.c

@@ -15,7 +15,7 @@
 
 #include "attribute_manager.h"
 
-#include <debug.h>
+#include <utils/debug.h>
 #include <collections/linked_list.h>
 #include <threading/rwlock.h>
 

src/libhydra/attributes/mem_pool.c

@@ -16,7 +16,7 @@
 
 #include "mem_pool.h"
 
-#include <debug.h>
+#include <utils/debug.h>
 #include <collections/hashtable.h>
 #include <collections/linked_list.h>
 #include <threading/mutex.h>

src/libhydra/hydra.c

@@ -15,7 +15,7 @@
 
 #include "hydra.h"
 
-#include <debug.h>
+#include <utils/debug.h>
 
 typedef struct private_hydra_t private_hydra_t;
 

src/libhydra/kernel/kernel_interface.c

@@ -40,7 +40,7 @@
 #include "kernel_interface.h"
 
 #include <hydra.h>
-#include <debug.h>
+#include <utils/debug.h>
 #include <threading/mutex.h>
 #include <collections/linked_list.h>
 

src/libhydra/plugins/attr/attr_provider.c

@@ -19,7 +19,7 @@
 #include <time.h>
 
 #include <hydra.h>
-#include <debug.h>
+#include <utils/debug.h>
 #include <collections/linked_list.h>
 #include <threading/rwlock.h>
 

src/libhydra/plugins/attr_sql/attr_sql_plugin.c

@@ -14,7 +14,7 @@
  */
 
 #include <hydra.h>
-#include <debug.h>
+#include <utils/debug.h>
 
 #include "attr_sql_plugin.h"
 #include "sql_attribute.h"

src/libhydra/plugins/attr_sql/pool.c

@@ -21,7 +21,7 @@
 #include <string.h>
 #include <errno.h>
 
-#include <debug.h>
+#include <utils/debug.h>
 #include <library.h>
 #include <networking/host.h>
 #include <utils/identification.h>

src/libhydra/plugins/attr_sql/sql_attribute.c

@@ -15,7 +15,7 @@
 
 #include <time.h>
 
-#include <debug.h>
+#include <utils/debug.h>
 #include <library.h>
 
 #include "sql_attribute.h"

src/libhydra/plugins/kernel_klips/kernel_klips_ipsec.c

@@ -29,7 +29,7 @@
 #include "kernel_klips_ipsec.h"
 
 #include <hydra.h>
-#include <debug.h>
+#include <utils/debug.h>
 #include <collections/linked_list.h>
 #include <threading/thread.h>
 #include <threading/mutex.h>

src/libhydra/plugins/kernel_netlink/kernel_netlink_ipsec.c

@@ -36,7 +36,7 @@
 #include "kernel_netlink_shared.h"
 
 #include <hydra.h>
-#include <debug.h>
+#include <utils/debug.h>
 #include <threading/thread.h>
 #include <threading/mutex.h>
 #include <collections/hashtable.h>

src/libhydra/plugins/kernel_netlink/kernel_netlink_net.c

@@ -49,7 +49,7 @@
 #include "kernel_netlink_shared.h"
 
 #include <hydra.h>
-#include <debug.h>
+#include <utils/debug.h>
 #include <threading/thread.h>
 #include <threading/mutex.h>
 #include <threading/rwlock.h>

src/libhydra/plugins/kernel_netlink/kernel_netlink_shared.c

@@ -21,7 +21,7 @@
 
 #include "kernel_netlink_shared.h"
 
-#include <debug.h>
+#include <utils/debug.h>
 #include <threading/mutex.h>
 
 typedef struct private_netlink_socket_t private_netlink_socket_t;

src/libhydra/plugins/kernel_pfkey/kernel_pfkey_ipsec.c

@@ -58,7 +58,7 @@
 #include "kernel_pfkey_ipsec.h"
 
 #include <hydra.h>
-#include <debug.h>
+#include <utils/debug.h>
 #include <networking/host.h>
 #include <collections/linked_list.h>
 #include <collections/hashtable.h>

src/libhydra/plugins/kernel_pfroute/kernel_pfroute_net.c

@@ -24,7 +24,7 @@
 #include "kernel_pfroute_net.h"
 
 #include <hydra.h>
-#include <debug.h>
+#include <utils/debug.h>
 #include <networking/host.h>
 #include <threading/thread.h>
 #include <threading/mutex.h>

src/libhydra/plugins/resolve/resolve_handler.c

@@ -21,7 +21,7 @@
 #include <unistd.h>
 
 #include <hydra.h>
-#include <debug.h>
+#include <utils/debug.h>
 #include <threading/mutex.h>
 
 /* path to resolvconf executable */

src/libimcv/ietf/ietf_attr_assess_result.c

@@ -18,7 +18,7 @@
 #include <pa_tnc/pa_tnc_msg.h>
 #include <bio/bio_writer.h>
 #include <bio/bio_reader.h>
-#include <debug.h>
+#include <utils/debug.h>
 
 typedef struct private_ietf_attr_assess_result_t private_ietf_attr_assess_result_t;
 

src/libimcv/ietf/ietf_attr_attr_request.c

@@ -21,7 +21,7 @@
 #include <bio/bio_reader.h>
 #include <collections/linked_list.h>
 
-#include <debug.h>
+#include <utils/debug.h>
 
 typedef struct private_ietf_attr_attr_request_t private_ietf_attr_attr_request_t;
 

src/libimcv/ietf/ietf_attr_default_pwd_enabled.c

@@ -18,7 +18,7 @@
 #include <pa_tnc/pa_tnc_msg.h>
 #include <bio/bio_writer.h>
 #include <bio/bio_reader.h>
-#include <debug.h>
+#include <utils/debug.h>
 
 typedef struct private_ietf_attr_default_pwd_enabled_t private_ietf_attr_default_pwd_enabled_t;
 

src/libimcv/ietf/ietf_attr_fwd_enabled.c

@@ -18,7 +18,7 @@
 #include <pa_tnc/pa_tnc_msg.h>
 #include <bio/bio_writer.h>
 #include <bio/bio_reader.h>
-#include <debug.h>
+#include <utils/debug.h>
 
 typedef struct private_ietf_attr_fwd_enabled_t private_ietf_attr_fwd_enabled_t;
 

src/libimcv/ietf/ietf_attr_installed_packages.c

@@ -21,7 +21,7 @@
 #include <bio/bio_writer.h>
 #include <bio/bio_reader.h>
 #include <collections/linked_list.h>
-#include <debug.h>
+#include <utils/debug.h>
 
 
 typedef struct private_ietf_attr_installed_packages_t private_ietf_attr_installed_packages_t;

src/libimcv/ietf/ietf_attr_numeric_version.c

@@ -18,7 +18,7 @@
 #include <pa_tnc/pa_tnc_msg.h>
 #include <bio/bio_writer.h>
 #include <bio/bio_reader.h>
-#include <debug.h>
+#include <utils/debug.h>
 
 typedef struct private_ietf_attr_numeric_version_t private_ietf_attr_numeric_version_t;
 

src/libimcv/ietf/ietf_attr_op_status.c

@@ -18,7 +18,7 @@
 #include <pa_tnc/pa_tnc_msg.h>
 #include <bio/bio_writer.h>
 #include <bio/bio_reader.h>
-#include <debug.h>
+#include <utils/debug.h>
 
 #include <time.h>
 

src/libimcv/ietf/ietf_attr_pa_tnc_error.c

@@ -18,7 +18,7 @@
 #include <pa_tnc/pa_tnc_msg.h>
 #include <bio/bio_writer.h>
 #include <bio/bio_reader.h>
-#include <debug.h>
+#include <utils/debug.h>
 
 ENUM(pa_tnc_error_code_names, PA_ERROR_RESERVED,
 							  PA_ERROR_ATTR_TYPE_NOT_SUPPORTED,

src/libimcv/ietf/ietf_attr_port_filter.c

@@ -18,7 +18,7 @@
 #include <bio/bio_writer.h>
 #include <bio/bio_reader.h>
 #include <collections/linked_list.h>
-#include <debug.h>
+#include <utils/debug.h>
 
 
 typedef struct private_ietf_attr_port_filter_t private_ietf_attr_port_filter_t;

src/libimcv/ietf/ietf_attr_product_info.c

@@ -17,7 +17,7 @@
 #include <pa_tnc/pa_tnc_msg.h>
 #include <bio/bio_writer.h>
 #include <bio/bio_reader.h>
-#include <debug.h>
+#include <utils/debug.h>
 
 typedef struct private_ietf_attr_product_info_t private_ietf_attr_product_info_t;
 

src/libimcv/ietf/ietf_attr_remediation_instr.c

@@ -18,7 +18,7 @@
 #include <pa_tnc/pa_tnc_msg.h>
 #include <bio/bio_writer.h>
 #include <bio/bio_reader.h>
-#include <debug.h>
+#include <utils/debug.h>
 
 typedef struct private_ietf_attr_remediation_instr_t private_ietf_attr_remediation_instr_t;
 

src/libimcv/ietf/ietf_attr_string_version.c

@@ -18,7 +18,7 @@
 #include <pa_tnc/pa_tnc_msg.h>
 #include <bio/bio_writer.h>
 #include <bio/bio_reader.h>
-#include <debug.h>
+#include <utils/debug.h>
 
 typedef struct private_ietf_attr_string_version_t private_ietf_attr_string_version_t;
 

src/libimcv/imc/imc_agent.c

@@ -18,7 +18,7 @@
 
 #include <tncif_names.h>
 
-#include <debug.h>
+#include <utils/debug.h>
 #include <threading/rwlock.h>
 
 typedef struct private_imc_agent_t private_imc_agent_t;

src/libimcv/imc/imc_msg.c

@@ -22,7 +22,7 @@
 
 #include <pen/pen.h>
 #include <collections/linked_list.h>
-#include <debug.h>
+#include <utils/debug.h>
 
 typedef struct private_imc_msg_t private_imc_msg_t;
 

src/libimcv/imcv.c

@@ -17,7 +17,7 @@
 #include "ita/ita_attr.h"
 
 #include <utils.h>
-#include <debug.h>
+#include <utils/debug.h>
 #include <pen/pen.h>
 
 #include <syslog.h>

src/libimcv/imv/imv_agent.c

@@ -19,7 +19,7 @@
 
 #include <tncif_names.h>
 
-#include <debug.h>
+#include <utils/debug.h>
 #include <threading/rwlock.h>
 
 typedef struct private_imv_agent_t private_imv_agent_t;

src/libimcv/imv/imv_msg.c

@@ -22,7 +22,7 @@
 
 #include <pen/pen.h>
 #include <collections/linked_list.h>
-#include <debug.h>
+#include <utils/debug.h>
 
 typedef struct private_imv_msg_t private_imv_msg_t;
 

src/libimcv/ita/ita_attr_command.c

@@ -18,7 +18,7 @@
 
 #include <pen/pen.h>
 
-#include <debug.h>
+#include <utils/debug.h>
 
 typedef struct private_ita_attr_command_t private_ita_attr_command_t;