- changed include paths

Source/charon/configuration_manager.c

@@ -26,13 +26,13 @@
 
 #include "configuration_manager.h"
 
-#include "types.h"
-#include "globals.h"
-#include "utils/allocator.h"
-#include "payloads/nonce_payload.h"
-#include "payloads/proposal_substructure.h"
-#include "payloads/ke_payload.h"
-#include "payloads/transform_attribute.h"
+#include <types.h>
+#include <globals.h>
+#include <utils/allocator.h>
+#include <payloads/nonce_payload.h>
+#include <payloads/proposal_substructure.h>
+#include <payloads/ke_payload.h>
+#include <payloads/transform_attribute.h>
 
 /**
  * Private data of an configuration_t object

Source/charon/configuration_manager.h

@@ -23,13 +23,13 @@
 #ifndef CONFIGURATION_MANAGER_H_
 #define CONFIGURATION_MANAGER_H_
 
-#include "types.h"
-#include "utils/linked_list.h"
-#include "utils/host.h"
-#include "payloads/transform_substructure.h"
-#include "transforms/prfs/prf.h"
-#include "transforms/signers/signer.h"
-#include "transforms/crypters/crypter.h"
+#include <types.h>
+#include <utils/linked_list.h>
+#include <utils/host.h>
+#include <payloads/transform_substructure.h>
+#include <transforms/prfs/prf.h>
+#include <transforms/signers/signer.h>
+#include <transforms/crypters/crypter.h>
 
 /**
  * @brief Manages all configuration aspects of the daemon.

Source/charon/daemon.c

@@ -132,15 +132,15 @@ int main()
 	 	destroy_and_exit(-1);
 	}
 	
-	int i;
-	for(i = 0; i<1; i++)
-	{
-		initiate_ike_sa_job_t *initiate_job;
-		
-		initiate_job = initiate_ike_sa_job_create("pinflb30");
-		global_event_queue->add_relative(global_event_queue, (job_t*)initiate_job, i * 1000);
-		
-	}
+//	int i;
+//	for(i = 0; i<1; i++)
+//	{
+//		initiate_ike_sa_job_t *initiate_job;
+//		
+//		initiate_job = initiate_ike_sa_job_create("pinflb30");
+//		global_event_queue->add_relative(global_event_queue, (job_t*)initiate_job, i * 1000);
+//		
+//	}
  	
  	logger->log(logger,CONTROL|MORE,"going to wait for exit signal");
  	/* go and handle signals*/

Source/charon/daemon.h

@@ -23,7 +23,7 @@
 #ifndef DAEMON_H_
 #define DAEMON_H_
 
-#include "globals.h"
+#include <globals.h>
 
 #define DAEMON_NAME "charon"
 

Source/charon/definitions.h

@@ -71,7 +71,9 @@
 #define min(x,y) (x < y ? x : y)
 
 
-
+/**
+ * mapping entry which defines the end of a mapping_t array
+ */
 #define MAPPING_END (-1)
 
 /**

Source/charon/generator.c

@@ -28,18 +28,18 @@
 
 #include "generator.h"
 
-#include "types.h"
-#include "globals.h"
-#include "utils/allocator.h"
-#include "utils/linked_list.h"
-#include "utils/logger_manager.h"
-#include "payloads/payload.h"
-#include "payloads/proposal_substructure.h"
-#include "payloads/transform_substructure.h"
-#include "payloads/sa_payload.h"
-#include "payloads/ke_payload.h"
-#include "payloads/notify_payload.h"
-#include "payloads/nonce_payload.h"
+#include <types.h>
+#include <globals.h>
+#include <utils/allocator.h>
+#include <utils/linked_list.h>
+#include <utils/logger_manager.h>
+#include <payloads/payload.h>
+#include <payloads/proposal_substructure.h>
+#include <payloads/transform_substructure.h>
+#include <payloads/sa_payload.h>
+#include <payloads/ke_payload.h>
+#include <payloads/notify_payload.h>
+#include <payloads/nonce_payload.h>
 
 /**
  * Private part of a generator_t object

Source/charon/generator.h

@@ -23,9 +23,9 @@
 #ifndef GENERATOR_H_
 #define GENERATOR_H_
 
-#include "types.h"
-#include "payloads/encodings.h"
-#include "payloads/payload.h"
+#include <types.h>
+#include <payloads/encodings.h>
+#include <payloads/payload.h>
 
 /**
  * Generating is done in a data buffer.

Source/charon/globals.h

@@ -23,13 +23,13 @@
 #ifndef GLOBALS_H_
 #define GLOBALS_H_
 
-#include "socket.h"
-#include "queues/send_queue.h"
-#include "queues/job_queue.h"
-#include "queues/event_queue.h"
-#include "utils/logger_manager.h"
-#include "ike_sa_manager.h"
-#include "configuration_manager.h"
+#include <socket.h>
+#include <ike_sa_manager.h>
+#include <queues/send_queue.h>
+#include <queues/job_queue.h>
+#include <queues/event_queue.h>
+#include <utils/logger_manager.h>
+#include <configuration_manager.h>
 
 
 extern socket_t *global_socket;

Source/charon/ike_sa.c

@@ -23,22 +23,22 @@
 
 #include "ike_sa.h"
 
-#include "types.h"
-#include "globals.h"
-#include "definitions.h"
-#include "utils/allocator.h"
-#include "utils/linked_list.h"
-#include "utils/logger_manager.h"
-#include "utils/randomizer.h"
-#include "transforms/diffie_hellman.h"
-#include "transforms/prf_plus.h"
-#include "payloads/sa_payload.h"
-#include "payloads/nonce_payload.h"
-#include "payloads/ke_payload.h"
-#include "payloads/transform_substructure.h"
-#include "payloads/transform_attribute.h"
-#include "states/initiator_init.h"
-#include "states/responder_init.h"
+#include <types.h>
+#include <globals.h>
+#include <definitions.h>
+#include <utils/allocator.h>
+#include <utils/linked_list.h>
+#include <utils/logger_manager.h>
+#include <utils/randomizer.h>
+#include <transforms/diffie_hellman.h>
+#include <transforms/prf_plus.h>
+#include <payloads/sa_payload.h>
+#include <payloads/nonce_payload.h>
+#include <payloads/ke_payload.h>
+#include <payloads/transform_substructure.h>
+#include <payloads/transform_attribute.h>
+#include <states/initiator_init.h>
+#include <states/responder_init.h>
 
 
 

Source/charon/ike_sa.h

@@ -24,15 +24,15 @@
 #ifndef IKE_SA_H_
 #define IKE_SA_H_
 
-#include "types.h"
-#include "message.h"
-#include "ike_sa_id.h"
-#include "utils/logger.h"
-#include "utils/randomizer.h"
-#include "states/state.h"
-#include "transforms/prfs/prf.h"
-#include "transforms/crypters/crypter.h"
-#include "transforms/signers/signer.h"
+#include <types.h>
+#include <message.h>
+#include <ike_sa_id.h>
+#include <utils/logger.h>
+#include <utils/randomizer.h>
+#include <states/state.h>
+#include <transforms/prfs/prf.h>
+#include <transforms/crypters/crypter.h>
+#include <transforms/signers/signer.h>
 
 
 

Source/charon/ike_sa_id.c

@@ -25,8 +25,8 @@
 
 #include "ike_sa_id.h"
 
-#include "types.h"
-#include "utils/allocator.h"
+#include <types.h>
+#include <utils/allocator.h>
 
 /**
  * Private data of an ike_sa_id object

Source/charon/ike_sa_manager.c

@@ -25,12 +25,12 @@
 
 #include "ike_sa_manager.h"
 
-#include "globals.h"
-#include "ike_sa_id.h"
-#include "utils/allocator.h"
-#include "utils/logger.h"
-#include "utils/logger_manager.h"
-#include "utils/linked_list.h"
+#include <globals.h>
+#include <ike_sa_id.h>
+#include <utils/allocator.h>
+#include <utils/logger.h>
+#include <utils/logger_manager.h>
+#include <utils/linked_list.h>
 
 /**
  * @brief An entry in the linked list, contains IKE_SA, locking and lookup data.

Source/charon/ike_sa_manager.h

@@ -23,8 +23,8 @@
 #ifndef IKE_SA_MANAGER_H_
 #define IKE_SA_MANAGER_H_
 
-#include "types.h"
-#include "ike_sa.h"
+#include <types.h>
+#include <ike_sa.h>
 
 
 /**

Source/charon/message.c

@@ -24,16 +24,16 @@
 
 #include "message.h"
 
-#include "types.h"
-#include "globals.h"
-#include "ike_sa_id.h"
-#include "generator.h"
-#include "utils/linked_list.h"
-#include "utils/allocator.h"
-#include "utils/logger_manager.h"
-#include "payloads/encodings.h"
-#include "payloads/payload.h"
-#include "parser.h"
+#include <types.h>
+#include <globals.h>
+#include <ike_sa_id.h>
+#include <generator.h>
+#include <parser.h>
+#include <utils/linked_list.h>
+#include <utils/allocator.h>
+#include <utils/logger_manager.h>
+#include <payloads/encodings.h>
+#include <payloads/payload.h>
 
 
 /**

Source/charon/message.h

@@ -23,11 +23,11 @@
 #ifndef MESSAGE_H_
 #define MESSAGE_H_
 
-#include "types.h"
-#include "packet.h"
-#include "ike_sa_id.h"
-#include "payloads/ike_header.h"
-#include "utils/linked_list.h"
+#include <types.h>
+#include <packet.h>
+#include <ike_sa_id.h>
+#include <payloads/ike_header.h>
+#include <utils/linked_list.h>
 
 
 

Source/charon/packet.c

@@ -23,7 +23,7 @@
 
 #include "packet.h"
 
-#include "utils/allocator.h"
+#include <utils/allocator.h>
 
 
 /**

Source/charon/packet.h

@@ -24,8 +24,8 @@
 #define PACKET_H_
 
 
-#include "types.h"
-#include "utils/host.h"
+#include <types.h>
+#include <utils/host.h>
 
 
 

Source/charon/parser.c

@@ -25,21 +25,21 @@
 
 #include "parser.h"
 
-#include "types.h"
-#include "definitions.h"
-#include "globals.h"
-#include "utils/allocator.h"
-#include "utils/logger.h"
-#include "utils/linked_list.h"
-#include "payloads/encodings.h"
-#include "payloads/payload.h"
-#include "payloads/sa_payload.h"
-#include "payloads/proposal_substructure.h"
-#include "payloads/transform_substructure.h"
-#include "payloads/transform_attribute.h"
-#include "payloads/ke_payload.h"
-#include "payloads/nonce_payload.h"
-#include "payloads/notify_payload.h"
+#include <types.h>
+#include <definitions.h>
+#include <globals.h>
+#include <utils/allocator.h>
+#include <utils/logger.h>
+#include <utils/linked_list.h>
+#include <payloads/encodings.h>
+#include <payloads/payload.h>
+#include <payloads/sa_payload.h>
+#include <payloads/proposal_substructure.h>
+#include <payloads/transform_substructure.h>
+#include <payloads/transform_attribute.h>
+#include <payloads/ke_payload.h>
+#include <payloads/nonce_payload.h>
+#include <payloads/notify_payload.h>
 
 
 

Source/charon/parser.h

@@ -23,9 +23,9 @@
 #ifndef PARSER_H_
 #define PARSER_H_
 
-#include "types.h"
-#include "payloads/encodings.h"
-#include "payloads/payload.h"
+#include <types.h>
+#include <payloads/encodings.h>
+#include <payloads/payload.h>
 
 
 /**

Source/charon/receiver.c

@@ -25,13 +25,13 @@
 
 #include "receiver.h"
 
-#include "jobs/job.h"
-#include "socket.h"
-#include "packet.h"
-#include "globals.h"
-#include "queues/job_queue.h"
-#include "utils/allocator.h"
-#include "utils/logger_manager.h"
+#include <socket.h>
+#include <packet.h>
+#include <globals.h>
+#include <jobs/job.h>
+#include <queues/job_queue.h>
+#include <utils/allocator.h>
+#include <utils/logger_manager.h>
 
 /**
  * Private data of a receiver object

Source/charon/receiver.h

@@ -23,7 +23,7 @@
 #ifndef RECEIVER_H_
 #define RECEIVER_H_
 
-#include "types.h"
+#include <types.h>
 
 /**
  * @brief A Receiver object which receives packets on the socket and adds them to the job-queue

Source/charon/scheduler.c

@@ -25,11 +25,11 @@
 
 #include "scheduler.h"
 
-#include "globals.h"
-#include "definitions.h"
-#include "utils/allocator.h"
-#include "utils/logger_manager.h"
-#include "queues/job_queue.h"
+#include <globals.h>
+#include <definitions.h>
+#include <utils/allocator.h>
+#include <utils/logger_manager.h>
+#include <queues/job_queue.h>
 
 /**
  * Private data of a scheduler object

Source/charon/scheduler.h

@@ -23,7 +23,7 @@
 #ifndef SCHEDULER_H_
 #define SCHEDULER_H_
 
-#include "types.h"
+#include <types.h>
 
 /**
  * @brief The scheduler, looks for timed events in event-queue and adds them

Source/charon/sender.c

@@ -25,12 +25,12 @@
 
 #include "sender.h"
 
-#include "socket.h"
-#include "packet.h"
-#include "globals.h"
-#include "queues/send_queue.h"
-#include "utils/allocator.h"
-#include "utils/logger_manager.h"
+#include <socket.h>
+#include <packet.h>
+#include <globals.h>
+#include <queues/send_queue.h>
+#include <utils/allocator.h>
+#include <utils/logger_manager.h>
 
 /**
  * Private data of a sender object

Source/charon/sender.h

@@ -23,7 +23,7 @@
 #ifndef SENDER_H_
 #define SENDER_H_
 
-#include "types.h"
+#include <types.h>
 
 /**
  * @brief A Sender object which sends packets on the socket

Source/charon/socket.c

@@ -32,9 +32,9 @@
 
 #include "socket.h"
 
-#include "globals.h"
-#include "utils/allocator.h"
-#include "utils/logger_manager.h"
+#include <globals.h>
+#include <utils/allocator.h>
+#include <utils/logger_manager.h>
 
 typedef struct private_socket_s private_socket_t;
 

Source/charon/socket.h

@@ -26,8 +26,8 @@
 #define SOCKET_H_
 
 
-#include "types.h"
-#include "packet.h"
+#include <types.h>
+#include <packet.h>
 
 
 /**

Source/charon/states/ike_auth_requested.c

@@ -22,7 +22,7 @@
  
 #include "ike_auth_requested.h"
 
-#include "../utils/allocator.h"
+#include <utils/allocator.h>
 
 /**
  * Private data of a ike_auth_requested_t object.

Source/charon/states/ike_auth_requested.h

@@ -23,8 +23,8 @@
 #ifndef IKE_AUTH_REQUESTED_H_
 #define IKE_AUTH_REQUESTED_H_
 
-#include "state.h"
-#include "../ike_sa.h"
+#include <states/state.h>
+#include <ike_sa.h>
 
 /**
  * @brief This class represents an IKE_SA, which has requested an IKE_AUTH.

Source/charon/states/ike_sa_established.c

@@ -22,7 +22,7 @@
  
 #include "ike_sa_established.h"
 
-#include "../utils/allocator.h"
+#include <utils/allocator.h>
 
 /**
  * Private data of a ike_sa_established_t object.

Source/charon/states/ike_sa_established.h

@@ -23,8 +23,8 @@
 #ifndef IKE_SA_ESTABLISHED_H_
 #define IKE_SA_ESTABLISHED_H_
 
-#include "state.h"
-#include "../ike_sa.h"
+#include <states/state.h>
+#include <ike_sa.h>
 
 /**
  * @brief This class represents an the state of an established

Source/charon/states/ike_sa_init_requested.c

@@ -22,12 +22,12 @@
  
 #include "ike_sa_init_requested.h"
 
-#include "../globals.h"
-#include "../utils/allocator.h"
-#include "../transforms/diffie_hellman.h"
-#include "../payloads/sa_payload.h"
-#include "../payloads/ke_payload.h"
-#include "../payloads/nonce_payload.h"
+#include <globals.h>
+#include <utils/allocator.h>
+#include <payloads/sa_payload.h>
+#include <payloads/ke_payload.h>
+#include <payloads/nonce_payload.h>
+#include <transforms/diffie_hellman.h>
 
 /**
  * Private data of a ike_sa_init_requested_t object.

Source/charon/states/ike_sa_init_requested.h

@@ -24,10 +24,10 @@
 #ifndef IKE_SA_INIT_REQUESTED_H_
 #define IKE_SA_INIT_REQUESTED_H_
 
-#include "state.h"
-#include "../types.h"
-#include "../transforms/diffie_hellman.h"
-#include "../ike_sa.h"
+#include <types.h>
+#include <ike_sa.h>
+#include <states/state.h>
+#include <transforms/diffie_hellman.h>
 
 /**
  * @brief This class represents an IKE_SA state when requested an IKE_SA_INIT

Source/charon/states/ike_sa_init_responded.c

@@ -22,7 +22,7 @@
  
 #include "ike_sa_init_responded.h"
 
-#include "../utils/allocator.h"
+#include <utils/allocator.h>
 
 /**
  * Private data of a ike_sa_init_responded_t object.

Source/charon/states/ike_sa_init_responded.h

@@ -23,9 +23,8 @@
 #ifndef IKE_SA_INIT_RESPONDED_H_
 #define IKE_SA_INIT_RESPONDED_H_
 
-#include "state.h"
-
-#include "../ike_sa.h"
+#include <ike_sa.h>
+#include <states/state.h>
 
 /**
  * @brief This class represents an IKE_SA state when responded to an IKE_SA_INIT request

Source/charon/states/initiator_init.c

@@ -23,14 +23,14 @@
 #include "initiator_init.h"
 
 
-#include "state.h"
-#include "ike_sa_init_requested.h"
-#include "../globals.h"
-#include "../utils/allocator.h"
-#include "../transforms/diffie_hellman.h"
-#include "../payloads/sa_payload.h"
-#include "../payloads/ke_payload.h"
-#include "../payloads/nonce_payload.h"
+#include <globals.h>
+#include <states/state.h>
+#include <states/ike_sa_init_requested.h>
+#include <utils/allocator.h>
+#include <transforms/diffie_hellman.h>
+#include <payloads/sa_payload.h>
+#include <payloads/ke_payload.h>
+#include <payloads/nonce_payload.h>
 
 
 /**

Source/charon/states/initiator_init.h

@@ -24,9 +24,9 @@
 #ifndef INITIATOR_INIT_H_
 #define INITIATOR_INIT_H_
 
-#include "state.h"
+#include <ike_sa.h>
+#include <states/state.h>
 
-#include "../ike_sa.h"
 
 /**
  * @brief This class represents an IKE_SA state when initializing

Source/charon/states/responder_init.c

@@ -22,13 +22,14 @@
  
 #include "responder_init.h"
 
-#include "ike_sa_init_responded.h"
-#include "../globals.h"
-#include "../utils/allocator.h"
-#include "../payloads/sa_payload.h"
-#include "../payloads/ke_payload.h"
-#include "../payloads/nonce_payload.h"
-#include "../transforms/diffie_hellman.h"
+#include <globals.h>
+#include <states/state.h>
+#include <states/ike_sa_init_responded.h>
+#include <utils/allocator.h>
+#include <payloads/sa_payload.h>
+#include <payloads/ke_payload.h>
+#include <payloads/nonce_payload.h>
+#include <transforms/diffie_hellman.h>
 
 /**
  * Private data of a responder_init_t object.

Source/charon/states/responder_init.h

@@ -23,9 +23,8 @@
 #ifndef RESPONDER_INIT_H_
 #define RESPONDER_INIT_H_
 
-#include "state.h"
-
-#include "../ike_sa.h"
+#include <ike_sa.h>
+#include <states/state.h>
 
 /**
  * @brief This class represents an IKE_SA state when initializing

Source/charon/states/state.h

@@ -23,9 +23,9 @@
 #ifndef STATE_H_
 #define STATE_H_
 
-#include "../definitions.h"
-#include "../types.h"
-#include "../message.h"
+#include <definitions.h>
+#include <types.h>
+#include <message.h>
 
 extern mapping_t ike_sa_state_m[];
 

Source/charon/thread_pool.c

@@ -27,10 +27,10 @@
 
 #include "thread_pool.h"
  
-#include "globals.h"
-#include "queues/job_queue.h"
-#include "utils/allocator.h"
-#include "utils/logger.h"
+#include <globals.h>
+#include <queues/job_queue.h>
+#include <utils/allocator.h>
+#include <utils/logger.h>
 
 /**
  * @brief structure with private members for thread_pool_t

Source/charon/thread_pool.h

@@ -25,7 +25,7 @@
 
 #include <stdlib.h>
 
-#include "types.h"
+#include <types.h>
 
 /**
  * @brief A thread_pool contains a pool of threads processing the job queue.

Source/charon/transforms/crypters/crypter.h

@@ -23,7 +23,7 @@
 #ifndef CRYPTER_H_
 #define CRYPTER_H_
 
-#include "../../payloads/transform_substructure.h"
+#include <payloads/transform_substructure.h>
 
 
 /**

Source/charon/transforms/diffie_hellman.c

@@ -27,10 +27,10 @@
 
 #include "diffie_hellman.h"
 
-#include "../payloads/transform_substructure.h"
-#include "../utils/allocator.h"
-#include "../utils/randomizer.h"
-#include "../utils/gmp_helper.h"
+#include <payloads/transform_substructure.h>
+#include <utils/allocator.h>
+#include <utils/randomizer.h>
+#include <utils/gmp_helper.h>
 
 
 /**

Source/charon/transforms/diffie_hellman.h

@@ -23,8 +23,8 @@
 #ifndef DIFFIE_HELLMAN_H_
 #define DIFFIE_HELLMAN_H_
 
-#include "../types.h"
-#include "../payloads/transform_substructure.h"
+#include <types.h>
+#include <payloads/transform_substructure.h>
 
 /**
  * Object representing a diffie hellman exchange

Source/charon/transforms/hashers/hasher.c

@@ -23,8 +23,8 @@
 
 #include "hasher.h"
 
-#include "hasher_sha1.h"
-#include "hasher_md5.h"
+#include <transforms/hashers/hasher_sha1.h>
+#include <transforms/hashers/hasher_md5.h>
 
 
 

Source/charon/transforms/hashers/hasher.h

@@ -24,7 +24,7 @@
 #define HASHER_H_
 
 
-#include "../../types.h"
+#include <types.h>
 
 /**
  * algorithms to use for hashing

Source/charon/transforms/hashers/hasher_md5.c

@@ -28,8 +28,8 @@
 
 #include "hasher_md5.h"
 
-#include "../../definitions.h"
-#include "../../utils/allocator.h"
+#include <definitions.h>
+#include <utils/allocator.h>
 
 #define BLOCK_SIZE_MD5 16
 

Source/charon/transforms/hashers/hasher_md5.h

@@ -24,7 +24,7 @@
 #ifndef HASHER_MD5_H_
 #define HASHER_MD5_H_
 
-#include "hasher.h"
+#include <transforms/hashers/hasher.h>
 
 
 /**

Source/charon/transforms/hashers/hasher_sha1.c

@@ -26,8 +26,8 @@
 
 #include "hasher_sha1.h"
 
-#include "../../definitions.h"
-#include "../../utils/allocator.h"
+#include <definitions.h>
+#include <utils/allocator.h>
 
 #define BLOCK_SIZE_SHA1 20
 

Source/charon/transforms/hashers/hasher_sha1.h

@@ -24,7 +24,7 @@
 #ifndef HASHER_SHA1_H_
 #define HASHER_SHA1_H_
 
-#include "hasher.h"
+#include <transforms/hashers/hasher.h>
 
 
 /**

Source/charon/transforms/hmac.c

@@ -24,7 +24,7 @@
 
 #include "hmac.h"
 
-#include "../utils/allocator.h"
+#include <utils/allocator.h>
 
 /**
  * Private data of an hmac_t object.

Source/charon/transforms/hmac.h

@@ -25,7 +25,7 @@
 #define HMAC_H_
 
 
-#include "hashers/hasher.h"
+#include <transforms/hashers/hasher.h>
 
 
 /**

Source/charon/transforms/prf_plus.c

@@ -23,8 +23,8 @@
 
 #include "prf_plus.h"
 
-#include "../utils/allocator.h"
-#include "../definitions.h"
+#include <utils/allocator.h>
+#include <definitions.h>
 
 /**
  * Private data of an prf_plus_t object.

Source/charon/transforms/prf_plus.h

@@ -24,7 +24,7 @@
 #define PRF_PLUS_H_
 
 
-#include "prfs/prf.h"
+#include <transforms/prfs/prf.h>
 
 
 /**

Source/charon/transforms/prfs/prf.c

@@ -23,8 +23,8 @@
 
 #include "prf.h"
 
-#include "prf_hmac.h"
-#include "../hashers/hasher.h"
+#include <transforms/hashers/hasher.h>
+#include <transforms/prfs/prf_hmac.h>
 
 
 /*

Source/charon/transforms/prfs/prf.h

@@ -23,7 +23,7 @@
 #ifndef PRF_H_
 #define PRF_H_
 
-#include "../../payloads/transform_substructure.h"
+#include <payloads/transform_substructure.h>
 
 
 /**

Source/charon/transforms/prfs/prf_hmac.c

@@ -23,8 +23,8 @@
 
 #include "prf_hmac.h"
 
-#include "../../utils/allocator.h"
-#include "../hmac.h"
+#include <utils/allocator.h>
+#include <transforms/hmac.h>
 
 typedef struct private_prf_hmac_s private_prf_hmac_t;
 

Source/charon/transforms/prfs/prf_hmac.h

@@ -26,8 +26,8 @@
 
 #include "prf.h"
 
-#include "../../types.h"
-#include "../hashers/hasher.h"
+#include <types.h>
+#include <transforms/hashers/hasher.h>
 
 /**
  * Object representing a prf using HMAC

Source/charon/transforms/signers/signer.h

@@ -23,7 +23,7 @@
 #ifndef SIGNER_H_
 #define SIGNER_H_
 
-#include "../../payloads/transform_substructure.h"
+#include <payloads/transform_substructure.h>
 
 
 /**

Source/charon/types.h

@@ -28,7 +28,7 @@
 #include <sys/types.h>
 #include <stdlib.h>
 
-#include "definitions.h"
+#include <definitions.h>
 
 typedef enum status_e {
 	SUCCESS,

Source/charon/utils/allocator.h

@@ -28,7 +28,7 @@
 #include <stddef.h>
 #include <string.h>
 
-#include "../types.h"
+#include <types.h>
 
 
 /**

Source/charon/utils/gmp_helper.c

@@ -25,8 +25,8 @@
  
 #include "gmp_helper.h"
 
-#include "allocator.h"
-#include "randomizer.h"
+#include <utils/allocator.h>
+#include <utils/randomizer.h>
 
 /**
  * Number of times the probabilistic primality test is applied

Source/charon/utils/gmp_helper.h

@@ -28,7 +28,7 @@
 
 #include <gmp.h>
 
-#include "../types.h"
+#include <types.h>
 
 /**
  * Class with helper functions to manipulate gmp values 

Source/charon/utils/host.c

@@ -20,11 +20,9 @@
  * for more details.
  */
 
-
-
 #include "host.h"
 
-#include "allocator.h"
+#include <utils/allocator.h>
 
 /**
  * @brief The logger object.

Source/charon/utils/host.h

@@ -30,7 +30,7 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 
-#include "../types.h"
+#include <types.h>
 
 /**
  * @brief The logger object

Source/charon/utils/linked_list.c

@@ -24,7 +24,7 @@
 
 #include "linked_list.h"
 
-#include "allocator.h"
+#include <utils/allocator.h>
 
 
 typedef struct linked_list_element_s linked_list_element_t;

Source/charon/utils/linked_list.h

@@ -23,7 +23,7 @@
 #ifndef LINKED_LIST_H_
 #define LINKED_LIST_H_
 
-#include "../types.h"
+#include <types.h>
 
 /**
  * @brief Iterator for a linked list

Source/charon/utils/logger.c

@@ -29,8 +29,8 @@
 
 #include "logger.h"
 
-#include "../daemon.h"
-#include "allocator.h"
+#include <daemon.h>
+#include <utils/allocator.h>
 
 /**
  * Maximum length of al log entry (only used for logger_s.log)

Source/charon/utils/logger.h

@@ -24,7 +24,8 @@
 #define LOGGER_H_
 
 #include <stdio.h>
-#include "../types.h"
+
+#include <types.h>
 
 /**
  * @brief Log Levels supported by the logger object

Source/charon/utils/logger_manager.c

@@ -23,9 +23,9 @@
  
 #include "logger_manager.h"
  
-#include "allocator.h"
-#include "linked_list.h"
-#include "../definitions.h"
+#include <definitions.h>
+#include <utils/allocator.h>
+#include <utils/linked_list.h>
 
 mapping_t logger_context_t_mappings[] = {
 	{PARSER, "PARSER"},

Source/charon/utils/logger_manager.h

@@ -25,7 +25,7 @@
 
 #include <pthread.h>
 
-#include "logger.h"
+#include <utils/logger.h>
 
 /**
  * @brief Context of a specific logger 

Source/charon/utils/randomizer.c

@@ -28,7 +28,7 @@
  
 #include "randomizer.h"
 
-#include "allocator.h"
+#include <utils/allocator.h>
 
 /**
  * Default random device used when no device is given.

Source/charon/utils/randomizer.h

@@ -23,7 +23,7 @@
 #ifndef RANDOMIZER_H_
 #define RANDOMIZER_H_
 
-#include "../types.h"
+#include <types.h>
 
 /**
  * Object representing an randomizer

Source/charon/utils/tester.c

@@ -28,9 +28,9 @@
 
 #include "tester.h"
 
-#include "allocator.h"
-#include "linked_list.h"
-#include "../queues/job_queue.h"
+#include <utils/allocator.h>
+#include <utils/linked_list.h>
+#include <queues/job_queue.h>
 
 /**
  * @brief Private Variables and Functions of tester class

Source/charon/utils/tester.h

@@ -25,7 +25,7 @@
 
 #include <stdio.h>
 
-#include "../types.h"
+#include <types.h>