7 files changed, 8 insertions, 8 deletions
diff --git a/src/methods/aes128_gcm/CMakeLists.txt b/src/methods/aes128_gcm/CMakeLists.txt
index 1c5aa3f..6d07318 100644
--- a/src/methods/aes128_gcm/CMakeLists.txt
+++ b/src/methods/aes128_gcm/CMakeLists.txt
@@ -1,4 +1,4 @@
-include_directories(BEFORE ${FASTD_SOURCE_DIR}/src ${FASTD_BINARY_DIR} ${NACL_INCLUDE_DIR})
+include_directories(${FASTD_SOURCE_DIR}/src ${FASTD_BINARY_DIR} ${NACL_INCLUDE_DIRS})
 
 add_library(method_aes128_gcm OBJECT
   aes128_gcm.c
diff --git a/src/methods/aes128_gcm/aes128_gcm.c b/src/methods/aes128_gcm/aes128_gcm.c
index 610df7c..0b0ad56 100644
--- a/src/methods/aes128_gcm/aes128_gcm.c
+++ b/src/methods/aes128_gcm/aes128_gcm.c
@@ -24,8 +24,8 @@
 */
 
 
-#include <fastd.h>
-#include <crypto.h>
+#include "../../fastd.h"
+#include "../../crypto.h"
 #include "../common.h"
 
 
diff --git a/src/methods/common.h b/src/methods/common.h
index 0337265..0a26a32 100644
--- a/src/methods/common.h
+++ b/src/methods/common.h
@@ -27,7 +27,7 @@
 #ifndef _FASTD_METHODS_COMMON_H_
 #define _FASTD_METHODS_COMMON_H_
 
-#include <fastd.h>
+#include "../fastd.h"
 
 
 #define COMMON_NONCEBYTES 7
diff --git a/src/methods/null/CMakeLists.txt b/src/methods/null/CMakeLists.txt
index 91c1832..90ead47 100644
--- a/src/methods/null/CMakeLists.txt
+++ b/src/methods/null/CMakeLists.txt
@@ -1,4 +1,4 @@
-include_directories(BEFORE ${FASTD_SOURCE_DIR}/src ${FASTD_BINARY_DIR})
+include_directories(${FASTD_SOURCE_DIR}/src ${FASTD_BINARY_DIR})
 
 add_library(method_null OBJECT
   null.c
diff --git a/src/methods/null/null.c b/src/methods/null/null.c
index 643e5e1..720cb79 100644
--- a/src/methods/null/null.c
+++ b/src/methods/null/null.c
@@ -24,7 +24,7 @@
 */
 
 
-#include <fastd.h>
+#include "../../fastd.h"
 
 
 struct fastd_method_session_state {
diff --git a/src/methods/xsalsa20_poly1305/CMakeLists.txt b/src/methods/xsalsa20_poly1305/CMakeLists.txt
index 09b029c..170a1ed 100644
--- a/src/methods/xsalsa20_poly1305/CMakeLists.txt
+++ b/src/methods/xsalsa20_poly1305/CMakeLists.txt
@@ -1,4 +1,4 @@
-include_directories(BEFORE ${FASTD_SOURCE_DIR}/src ${FASTD_BINARY_DIR} ${NACL_INCLUDE_DIR})
+include_directories(${FASTD_SOURCE_DIR}/src ${FASTD_BINARY_DIR} ${NACL_INCLUDE_DIRS})
 
 add_library(method_xsalsa20_poly1305 OBJECT
   xsalsa20_poly1305.c
diff --git a/src/methods/xsalsa20_poly1305/xsalsa20_poly1305.c b/src/methods/xsalsa20_poly1305/xsalsa20_poly1305.c
index 0a9f2c8..825a4b8 100644
--- a/src/methods/xsalsa20_poly1305/xsalsa20_poly1305.c
+++ b/src/methods/xsalsa20_poly1305/xsalsa20_poly1305.c
@@ -24,7 +24,7 @@
 */
 
 
-#include <fastd.h>
+#include "../../fastd.h"
 #include "../common.h"
 
 #include <crypto_secretbox_xsalsa20poly1305.h>