5 files changed, 15 insertions, 15 deletions
diff --git a/Source/charon/config/Makefile.config b/Source/charon/config/Makefile.config
index 58ff4e69e..c95bccb8d 100644
--- a/Source/charon/config/Makefile.config
+++ b/Source/charon/config/Makefile.config
@@ -12,26 +12,26 @@
 # for more details.
 #
 
-CONFIG_DIR= $(MAIN_DIR)config/
+CONFIG_DIR= $(CHARON_DIR)config/
 
 
 						
-OBJS+= $(BUILD_DIR)connection.o
+CHARON_OBJS+= $(BUILD_DIR)connection.o
 $(BUILD_DIR)connection.o :					$(CONFIG_DIR)connection.c $(CONFIG_DIR)connection.h
 											$(CC) $(CFLAGS) -c -o $@ $<
 											
-OBJS+= $(BUILD_DIR)policy.o
+CHARON_OBJS+= $(BUILD_DIR)policy.o
 $(BUILD_DIR)policy.o :						$(CONFIG_DIR)policy.c $(CONFIG_DIR)policy.h
 											$(CC) $(CFLAGS) -c -o $@ $<
 
-OBJS+= $(BUILD_DIR)traffic_selector.o
+CHARON_OBJS+= $(BUILD_DIR)traffic_selector.o
 $(BUILD_DIR)traffic_selector.o :			$(CONFIG_DIR)traffic_selector.c $(CONFIG_DIR)traffic_selector.h
 											$(CC) $(CFLAGS) -c -o $@ $<
 
-OBJS+= $(BUILD_DIR)proposal.o
+CHARON_OBJS+= $(BUILD_DIR)proposal.o
 $(BUILD_DIR)proposal.o :					$(CONFIG_DIR)proposal.c $(CONFIG_DIR)proposal.h
 											$(CC) $(CFLAGS) -c -o $@ $<
 
-OBJS+= $(BUILD_DIR)configuration.o
+CHARON_OBJS+= $(BUILD_DIR)configuration.o
 $(BUILD_DIR)configuration.o :				$(CONFIG_DIR)configuration.c $(CONFIG_DIR)configuration.h
 											$(CC) $(CFLAGS) -c -o $@ $<
 \ No newline at end of file
diff --git a/Source/charon/config/connection.h b/Source/charon/config/connection.h
index 9ec26b778..8ecce9d66 100644
--- a/Source/charon/config/connection.h
+++ b/Source/charon/config/connection.h
@@ -24,11 +24,11 @@
 #define CONNECTION_H_
 
 #include <types.h>
-#include <network/host.h>
+#include <utils/host.h>
 #include <utils/linked_list.h>
 #include <utils/identification.h>
 #include <config/proposal.h>
-#include <transforms/diffie_hellman.h>
+#include <crypto/diffie_hellman.h>
 
 
 typedef enum auth_method_t auth_method_t;
diff --git a/Source/charon/config/credential_store.h b/Source/charon/config/credential_store.h
index 27f957aa1..27f1a287d 100755
--- a/Source/charon/config/credential_store.h
+++ b/Source/charon/config/credential_store.h
@@ -24,8 +24,8 @@
 #define CREDENTIAL_STORE_H_
 
 #include <types.h>
-#include <transforms/rsa/rsa_private_key.h>
-#include <transforms/rsa/rsa_public_key.h>
+#include <crypto/rsa/rsa_private_key.h>
+#include <crypto/rsa/rsa_public_key.h>
 
 
 typedef struct credential_store_t credential_store_t;
diff --git a/Source/charon/config/proposal.h b/Source/charon/config/proposal.h
index 9c75406cc..48e3ad8d5 100644
--- a/Source/charon/config/proposal.h
+++ b/Source/charon/config/proposal.h
@@ -26,10 +26,10 @@
 #include <types.h>
 #include <utils/identification.h>
 #include <utils/linked_list.h>
-#include <network/host.h>
-#include <transforms/crypters/crypter.h>
-#include <transforms/signers/signer.h>
-#include <transforms/diffie_hellman.h>
+#include <utils/host.h>
+#include <crypto/crypters/crypter.h>
+#include <crypto/signers/signer.h>
+#include <crypto/diffie_hellman.h>
 #include <config/traffic_selector.h>
 
 
diff --git a/Source/charon/config/traffic_selector.h b/Source/charon/config/traffic_selector.h
index 7e59b53fc..5ac5bdeb1 100644
--- a/Source/charon/config/traffic_selector.h
+++ b/Source/charon/config/traffic_selector.h
@@ -24,7 +24,7 @@
 #define TRAFFIC_SELECTOR_H_
 
 #include <types.h>
-#include <network/host.h>
+#include <utils/host.h>
 
 typedef enum ts_type_t ts_type_t;