From a6df447495600f67417768cdd6fa829ae0a7bea9 Mon Sep 17 00:00:00 2001
From: Tim Crawford <tcrawford@datto.com>
Date: Dec 06 2018 20:39:34 +0000
Subject: Specify include path for feature tests


---

diff --git a/src/configure-tests/feature-tests/Makefile b/src/configure-tests/feature-tests/Makefile
index d3ecbc9..3775661 100644
--- a/src/configure-tests/feature-tests/Makefile
+++ b/src/configure-tests/feature-tests/Makefile
@@ -3,7 +3,7 @@ obj-m := $(OBJ)
 KERNELVERSION ?= $(shell uname -r)
 KDIR := /lib/modules/$(KERNELVERSION)/build
 PWD := $(shell pwd)
-EXTRA_CFLAGS := -g -Werror
+EXTRA_CFLAGS := -g -Werror -I$(src)/../..
 
 default:
 	$(MAKE) -C $(KDIR) M=$(PWD) modules
diff --git a/src/configure-tests/feature-tests/__dentry_path.c b/src/configure-tests/feature-tests/__dentry_path.c
index 6734dfe..1f0da68 100644
--- a/src/configure-tests/feature-tests/__dentry_path.c
+++ b/src/configure-tests/feature-tests/__dentry_path.c
@@ -8,7 +8,7 @@
     by the Free Software Foundation.
 */
 
-#include "../../includes.h"
+#include "includes.h"
 
 static inline void dummy(void){
 	char *c = NULL;
diff --git a/src/configure-tests/feature-tests/bd_super.c b/src/configure-tests/feature-tests/bd_super.c
index 711e567..c8f80e3 100644
--- a/src/configure-tests/feature-tests/bd_super.c
+++ b/src/configure-tests/feature-tests/bd_super.c
@@ -8,7 +8,7 @@
     by the Free Software Foundation.
 */
 
-#include "../../includes.h"
+#include "includes.h"
 
 static inline void dummy(void){
 	struct block_device bd;
diff --git a/src/configure-tests/feature-tests/bdev_stack_limits.c b/src/configure-tests/feature-tests/bdev_stack_limits.c
index cbe1765..bb4f4b0 100644
--- a/src/configure-tests/feature-tests/bdev_stack_limits.c
+++ b/src/configure-tests/feature-tests/bdev_stack_limits.c
@@ -8,7 +8,7 @@
     by the Free Software Foundation.
 */
 
-#include "../../includes.h"
+#include "includes.h"
 
 static inline void dummy(void){
 	struct queue_limits *t;
diff --git a/src/configure-tests/feature-tests/bdops_open_inode.c b/src/configure-tests/feature-tests/bdops_open_inode.c
index 3472bde..0068e7a 100644
--- a/src/configure-tests/feature-tests/bdops_open_inode.c
+++ b/src/configure-tests/feature-tests/bdops_open_inode.c
@@ -8,7 +8,7 @@
     by the Free Software Foundation.
 */
 
-#include "../../includes.h"
+#include "includes.h"
 
 static int snap_open(struct inode *inode, struct file *filp){
 	return 0;
diff --git a/src/configure-tests/feature-tests/bdops_open_int.c b/src/configure-tests/feature-tests/bdops_open_int.c
index 9e0fb2e..c6f3cfc 100644
--- a/src/configure-tests/feature-tests/bdops_open_int.c
+++ b/src/configure-tests/feature-tests/bdops_open_int.c
@@ -8,7 +8,7 @@
     by the Free Software Foundation.
 */
 
-#include "../../includes.h"
+#include "includes.h"
 
 static int snap_open(struct block_device *bdev, fmode_t mode){
 	return 0;
diff --git a/src/configure-tests/feature-tests/bio_bi_bdev.c b/src/configure-tests/feature-tests/bio_bi_bdev.c
index b8b2005..fb7c59e 100644
--- a/src/configure-tests/feature-tests/bio_bi_bdev.c
+++ b/src/configure-tests/feature-tests/bio_bi_bdev.c
@@ -8,7 +8,7 @@
     by the Free Software Foundation.
 */
 
-#include "../../includes.h"
+#include "includes.h"
 
 static inline void dummy(void){
 	struct bio bio;
diff --git a/src/configure-tests/feature-tests/bio_bi_pool.c b/src/configure-tests/feature-tests/bio_bi_pool.c
index 41bec13..d94666b 100644
--- a/src/configure-tests/feature-tests/bio_bi_pool.c
+++ b/src/configure-tests/feature-tests/bio_bi_pool.c
@@ -8,7 +8,7 @@
     by the Free Software Foundation.
 */
 
-#include "../../includes.h"
+#include "includes.h"
 
 static inline void dummy(void){
 	struct bio bio;
diff --git a/src/configure-tests/feature-tests/bio_bi_remaining.c b/src/configure-tests/feature-tests/bio_bi_remaining.c
index 057ed07..10aaddb 100644
--- a/src/configure-tests/feature-tests/bio_bi_remaining.c
+++ b/src/configure-tests/feature-tests/bio_bi_remaining.c
@@ -8,7 +8,7 @@
     by the Free Software Foundation.
 */
 
-#include "../../includes.h"
+#include "includes.h"
 
 static inline void dummy(void){
 	struct bio b;
diff --git a/src/configure-tests/feature-tests/bio_endio_1.c b/src/configure-tests/feature-tests/bio_endio_1.c
index a13b0e4..098ee5f 100644
--- a/src/configure-tests/feature-tests/bio_endio_1.c
+++ b/src/configure-tests/feature-tests/bio_endio_1.c
@@ -8,7 +8,7 @@
     by the Free Software Foundation.
 */
 
-#include "../../includes.h"
+#include "includes.h"
 
 static inline void dummy(void){
 	bio_endio(NULL);
diff --git a/src/configure-tests/feature-tests/bio_endio_int.c b/src/configure-tests/feature-tests/bio_endio_int.c
index 1c0a66f..61b9a98 100644
--- a/src/configure-tests/feature-tests/bio_endio_int.c
+++ b/src/configure-tests/feature-tests/bio_endio_int.c
@@ -8,7 +8,7 @@
     by the Free Software Foundation.
 */
 
-#include "../../includes.h"
+#include "includes.h"
 
 static int dummy_endio(struct bio *bio, unsigned int bytes, int err){
 	return 0;
diff --git a/src/configure-tests/feature-tests/bio_list.c b/src/configure-tests/feature-tests/bio_list.c
index b2089d5..e9f5ebc 100644
--- a/src/configure-tests/feature-tests/bio_list.c
+++ b/src/configure-tests/feature-tests/bio_list.c
@@ -8,7 +8,7 @@
     by the Free Software Foundation.
 */
 
-#include "../../includes.h"
+#include "includes.h"
 
 static inline void dummy(void){
 	struct bio_list bl;
diff --git a/src/configure-tests/feature-tests/bioset_create_3.c b/src/configure-tests/feature-tests/bioset_create_3.c
index eec006e..e342f8a 100644
--- a/src/configure-tests/feature-tests/bioset_create_3.c
+++ b/src/configure-tests/feature-tests/bioset_create_3.c
@@ -8,7 +8,7 @@
     by the Free Software Foundation.
 */
 
-#include "../../includes.h"
+#include "includes.h"
 
 static inline void dummy(void){
 	struct bio_set *bs;
diff --git a/src/configure-tests/feature-tests/bioset_init.c b/src/configure-tests/feature-tests/bioset_init.c
index 3da9634..3eeae84 100644
--- a/src/configure-tests/feature-tests/bioset_init.c
+++ b/src/configure-tests/feature-tests/bioset_init.c
@@ -8,7 +8,7 @@
     by the Free Software Foundation.
 */
 
-#include "../../includes.h"
+#include "includes.h"
 
 static inline void dummy(void){
 	struct bio_set bs;
diff --git a/src/configure-tests/feature-tests/bioset_need_bvecs_flag.c b/src/configure-tests/feature-tests/bioset_need_bvecs_flag.c
index 77a9955..9745b17 100644
--- a/src/configure-tests/feature-tests/bioset_need_bvecs_flag.c
+++ b/src/configure-tests/feature-tests/bioset_need_bvecs_flag.c
@@ -8,7 +8,7 @@
     by the Free Software Foundation.
 */
 
-#include "../../includes.h"
+#include "includes.h"
 
 static inline void dummy(void){
 	int flags = BIOSET_NEED_BVECS;
diff --git a/src/configure-tests/feature-tests/blk_set_default_limits.c b/src/configure-tests/feature-tests/blk_set_default_limits.c
index c5addce..f71fbef 100644
--- a/src/configure-tests/feature-tests/blk_set_default_limits.c
+++ b/src/configure-tests/feature-tests/blk_set_default_limits.c
@@ -8,7 +8,7 @@
     by the Free Software Foundation.
 */
 
-#include "../../includes.h"
+#include "includes.h"
 
 static inline void dummy(void){
 	struct queue_limits *l = NULL;
diff --git a/src/configure-tests/feature-tests/blk_set_stacking_limits.c b/src/configure-tests/feature-tests/blk_set_stacking_limits.c
index 8bf75cb..3c8c0b4 100644
--- a/src/configure-tests/feature-tests/blk_set_stacking_limits.c
+++ b/src/configure-tests/feature-tests/blk_set_stacking_limits.c
@@ -8,7 +8,7 @@
     by the Free Software Foundation.
 */
 
-#include "../../includes.h"
+#include "includes.h"
 
 static inline void dummy(void){
 	struct queue_limits *l = NULL;
diff --git a/src/configure-tests/feature-tests/blk_status_t.c b/src/configure-tests/feature-tests/blk_status_t.c
index 18a2efe..b1e58f5 100644
--- a/src/configure-tests/feature-tests/blk_status_t.c
+++ b/src/configure-tests/feature-tests/blk_status_t.c
@@ -8,7 +8,7 @@
     by the Free Software Foundation.
 */
 
-#include "../../includes.h"
+#include "includes.h"
 
 static inline void dummy(void){
 	blk_status_t b = BLK_STS_OK;
diff --git a/src/configure-tests/feature-tests/blkdev_get_by_path.c b/src/configure-tests/feature-tests/blkdev_get_by_path.c
index b9d26c2..df6351d 100644
--- a/src/configure-tests/feature-tests/blkdev_get_by_path.c
+++ b/src/configure-tests/feature-tests/blkdev_get_by_path.c
@@ -8,7 +8,7 @@
     by the Free Software Foundation.
 */
 
-#include "../../includes.h"
+#include "includes.h"
 
 static inline void dummy(void){
 	struct block_device *bd = blkdev_get_by_path("path", FMODE_READ, NULL);
diff --git a/src/configure-tests/feature-tests/blkdev_put_1.c b/src/configure-tests/feature-tests/blkdev_put_1.c
index d4856d5..1242e31 100644
--- a/src/configure-tests/feature-tests/blkdev_put_1.c
+++ b/src/configure-tests/feature-tests/blkdev_put_1.c
@@ -8,7 +8,7 @@
     by the Free Software Foundation.
 */
 
-#include "../../includes.h"
+#include "includes.h"
 
 static inline void dummy(void){
 	struct block_device bd;
diff --git a/src/configure-tests/feature-tests/bvec_iter.c b/src/configure-tests/feature-tests/bvec_iter.c
index 7ac33cc..3448503 100644
--- a/src/configure-tests/feature-tests/bvec_iter.c
+++ b/src/configure-tests/feature-tests/bvec_iter.c
@@ -8,7 +8,7 @@
     by the Free Software Foundation.
 */
 
-#include "../../includes.h"
+#include "includes.h"
 
 static inline void dummy(void){
 	struct bvec_iter iter;
diff --git a/src/configure-tests/feature-tests/bvec_merge_data.c b/src/configure-tests/feature-tests/bvec_merge_data.c
index ca0e683..5e094a1 100644
--- a/src/configure-tests/feature-tests/bvec_merge_data.c
+++ b/src/configure-tests/feature-tests/bvec_merge_data.c
@@ -8,7 +8,7 @@
     by the Free Software Foundation.
 */
 
-#include "../../includes.h"
+#include "includes.h"
 
 static inline void dummy(void){
 	struct bvec_merge_data bmd;
diff --git a/src/configure-tests/feature-tests/d_unlinked.c b/src/configure-tests/feature-tests/d_unlinked.c
index 3f436dc..9bc6961 100644
--- a/src/configure-tests/feature-tests/d_unlinked.c
+++ b/src/configure-tests/feature-tests/d_unlinked.c
@@ -8,7 +8,7 @@
     by the Free Software Foundation.
 */
 
-#include "../../includes.h"
+#include "includes.h"
 
 static inline void dummy(void){
 	struct dentry d;
diff --git a/src/configure-tests/feature-tests/dentry_path_raw.c b/src/configure-tests/feature-tests/dentry_path_raw.c
index a1b2dfe..2b6f02a 100644
--- a/src/configure-tests/feature-tests/dentry_path_raw.c
+++ b/src/configure-tests/feature-tests/dentry_path_raw.c
@@ -8,7 +8,7 @@
     by the Free Software Foundation.
 */
 
-#include "../../includes.h"
+#include "includes.h"
 
 static inline void dummy(void){
 	char *c = NULL;
diff --git a/src/configure-tests/feature-tests/enum_req_op.c b/src/configure-tests/feature-tests/enum_req_op.c
index fd095e2..20101db 100644
--- a/src/configure-tests/feature-tests/enum_req_op.c
+++ b/src/configure-tests/feature-tests/enum_req_op.c
@@ -8,7 +8,7 @@
     by the Free Software Foundation.
 */
 
-#include "../../includes.h"
+#include "includes.h"
 
 static inline void dummy(void){
 	enum req_op n = 0;
diff --git a/src/configure-tests/feature-tests/enum_req_opf.c b/src/configure-tests/feature-tests/enum_req_opf.c
index c6a4909..f33daa3 100644
--- a/src/configure-tests/feature-tests/enum_req_opf.c
+++ b/src/configure-tests/feature-tests/enum_req_opf.c
@@ -8,7 +8,7 @@
     by the Free Software Foundation.
 */
 
-#include "../../includes.h"
+#include "includes.h"
 
 static inline void dummy(void){
 	enum req_opf n = 0;
diff --git a/src/configure-tests/feature-tests/file_inode.c b/src/configure-tests/feature-tests/file_inode.c
index ccea86f..604f149 100644
--- a/src/configure-tests/feature-tests/file_inode.c
+++ b/src/configure-tests/feature-tests/file_inode.c
@@ -8,7 +8,7 @@
     by the Free Software Foundation.
 */
 
-#include "../../includes.h"
+#include "includes.h"
 
 static inline void dummy(void){
 	struct file *f;
diff --git a/src/configure-tests/feature-tests/fmode_t.c b/src/configure-tests/feature-tests/fmode_t.c
index 7763c7a..d4d3c39 100644
--- a/src/configure-tests/feature-tests/fmode_t.c
+++ b/src/configure-tests/feature-tests/fmode_t.c
@@ -8,7 +8,7 @@
     by the Free Software Foundation.
 */
 
-#include "../../includes.h"
+#include "includes.h"
 
 static inline void dummy(void){
 	fmode_t f;
diff --git a/src/configure-tests/feature-tests/fops_fallocate.c b/src/configure-tests/feature-tests/fops_fallocate.c
index e6dfe3f..a54fe52 100644
--- a/src/configure-tests/feature-tests/fops_fallocate.c
+++ b/src/configure-tests/feature-tests/fops_fallocate.c
@@ -8,7 +8,7 @@
     by the Free Software Foundation.
 */
 
-#include "../../includes.h"
+#include "includes.h"
 
 static inline void dummy(void){
 	struct file f = { .f_version = 0 };
diff --git a/src/configure-tests/feature-tests/genhd_fl_no_part_scan.c b/src/configure-tests/feature-tests/genhd_fl_no_part_scan.c
index 903eadd..375c328 100644
--- a/src/configure-tests/feature-tests/genhd_fl_no_part_scan.c
+++ b/src/configure-tests/feature-tests/genhd_fl_no_part_scan.c
@@ -8,7 +8,7 @@
     by the Free Software Foundation.
 */
 
-#include "../../includes.h"
+#include "includes.h"
 
 static inline void dummy(void){
 	struct gendisk gd;
diff --git a/src/configure-tests/feature-tests/inode_lock.c b/src/configure-tests/feature-tests/inode_lock.c
index 80771a1..a8d393e 100644
--- a/src/configure-tests/feature-tests/inode_lock.c
+++ b/src/configure-tests/feature-tests/inode_lock.c
@@ -8,7 +8,7 @@
     by the Free Software Foundation.
 */
 
-#include "../../includes.h"
+#include "includes.h"
 
 static inline void dummy(void){
 	struct inode i;
diff --git a/src/configure-tests/feature-tests/iops_fallocate.c b/src/configure-tests/feature-tests/iops_fallocate.c
index 253bb2f..1183d01 100644
--- a/src/configure-tests/feature-tests/iops_fallocate.c
+++ b/src/configure-tests/feature-tests/iops_fallocate.c
@@ -8,7 +8,7 @@
     by the Free Software Foundation.
 */
 
-#include "../../includes.h"
+#include "includes.h"
 
 static inline void dummy(void){
 	struct inode i = { .i_sb = NULL };
diff --git a/src/configure-tests/feature-tests/kern_path.c b/src/configure-tests/feature-tests/kern_path.c
index a63faa2..72d9c6c 100644
--- a/src/configure-tests/feature-tests/kern_path.c
+++ b/src/configure-tests/feature-tests/kern_path.c
@@ -8,7 +8,7 @@
     by the Free Software Foundation.
 */
 
-#include "../../includes.h"
+#include "includes.h"
 
 static inline void dummy(void){
 	struct path p;
diff --git a/src/configure-tests/feature-tests/kernel_read_ppos.c b/src/configure-tests/feature-tests/kernel_read_ppos.c
index bc943d7..fd32cbd 100644
--- a/src/configure-tests/feature-tests/kernel_read_ppos.c
+++ b/src/configure-tests/feature-tests/kernel_read_ppos.c
@@ -8,7 +8,7 @@
     by the Free Software Foundation.
 */
 
-#include "../../includes.h"
+#include "includes.h"
 
 static inline void dummy(void){
 	struct file *f = NULL;
diff --git a/src/configure-tests/feature-tests/kernel_write_ppos.c b/src/configure-tests/feature-tests/kernel_write_ppos.c
index d79c4bd..013bb6f 100644
--- a/src/configure-tests/feature-tests/kernel_write_ppos.c
+++ b/src/configure-tests/feature-tests/kernel_write_ppos.c
@@ -8,7 +8,7 @@
     by the Free Software Foundation.
 */
 
-#include "../../includes.h"
+#include "includes.h"
 
 static inline void dummy(void){
 	struct file *f = NULL;
diff --git a/src/configure-tests/feature-tests/make_request_fn_int.c b/src/configure-tests/feature-tests/make_request_fn_int.c
index 1e32e7c..13b3f22 100644
--- a/src/configure-tests/feature-tests/make_request_fn_int.c
+++ b/src/configure-tests/feature-tests/make_request_fn_int.c
@@ -8,7 +8,7 @@
     by the Free Software Foundation.
 */
 
-#include "../../includes.h"
+#include "includes.h"
 
 static int dummy_mrf(struct request_queue *q, struct bio *bio){
 	return 0;
diff --git a/src/configure-tests/feature-tests/make_request_fn_void.c b/src/configure-tests/feature-tests/make_request_fn_void.c
index bb87543..8531079 100644
--- a/src/configure-tests/feature-tests/make_request_fn_void.c
+++ b/src/configure-tests/feature-tests/make_request_fn_void.c
@@ -8,7 +8,7 @@
     by the Free Software Foundation.
 */
 
-#include "../../includes.h"
+#include "includes.h"
 
 static void dummy_mrf(struct request_queue *q, struct bio *bio){
 	return;
diff --git a/src/configure-tests/feature-tests/merge_bvec_fn.c b/src/configure-tests/feature-tests/merge_bvec_fn.c
index 075ca0a..e6e65f3 100644
--- a/src/configure-tests/feature-tests/merge_bvec_fn.c
+++ b/src/configure-tests/feature-tests/merge_bvec_fn.c
@@ -8,7 +8,7 @@
     by the Free Software Foundation.
 */
 
-#include "../../includes.h"
+#include "includes.h"
 
 static int dummy_merge_bvec(struct request_queue *q, struct bvec_merge_data *bvm, struct bio_vec *bvec){
 	return 0;
diff --git a/src/configure-tests/feature-tests/mnt_want_write.c b/src/configure-tests/feature-tests/mnt_want_write.c
index 04bc79d..803351d 100644
--- a/src/configure-tests/feature-tests/mnt_want_write.c
+++ b/src/configure-tests/feature-tests/mnt_want_write.c
@@ -8,7 +8,7 @@
     by the Free Software Foundation.
 */
 
-#include "../../includes.h"
+#include "includes.h"
 
 static inline void dummy(void){
 	struct vfsmount *mnt
diff --git a/src/configure-tests/feature-tests/noop_llseek.c b/src/configure-tests/feature-tests/noop_llseek.c
index 3938ad1..c445b8f 100644
--- a/src/configure-tests/feature-tests/noop_llseek.c
+++ b/src/configure-tests/feature-tests/noop_llseek.c
@@ -8,7 +8,7 @@
     by the Free Software Foundation.
 */
 
-#include "../../includes.h"
+#include "includes.h"
 
 static inline void dummy(void){
 	struct file f;
diff --git a/src/configure-tests/feature-tests/notify_change_2.c b/src/configure-tests/feature-tests/notify_change_2.c
index 851cc18..27ebddf 100644
--- a/src/configure-tests/feature-tests/notify_change_2.c
+++ b/src/configure-tests/feature-tests/notify_change_2.c
@@ -8,7 +8,7 @@
     by the Free Software Foundation.
 */
 
-#include "../../includes.h"
+#include "includes.h"
 
 static inline void dummy(void){
 	struct dentry d;
diff --git a/src/configure-tests/feature-tests/part_nr_sects_read.c b/src/configure-tests/feature-tests/part_nr_sects_read.c
index d4f5680..1142375 100644
--- a/src/configure-tests/feature-tests/part_nr_sects_read.c
+++ b/src/configure-tests/feature-tests/part_nr_sects_read.c
@@ -8,7 +8,7 @@
     by the Free Software Foundation.
 */
 
-#include "../../includes.h"
+#include "includes.h"
 
 static inline void dummy(void){
 	struct hd_struct hd;
diff --git a/src/configure-tests/feature-tests/path_put.c b/src/configure-tests/feature-tests/path_put.c
index 8335f87..6b30ba9 100644
--- a/src/configure-tests/feature-tests/path_put.c
+++ b/src/configure-tests/feature-tests/path_put.c
@@ -8,7 +8,7 @@
     by the Free Software Foundation.
 */
 
-#include "../../includes.h"
+#include "includes.h"
 
 static inline void dummy(void){
 	struct path p;
diff --git a/src/configure-tests/feature-tests/proc_create.c b/src/configure-tests/feature-tests/proc_create.c
index 18c7337..ebc1d97 100644
--- a/src/configure-tests/feature-tests/proc_create.c
+++ b/src/configure-tests/feature-tests/proc_create.c
@@ -8,7 +8,7 @@
     by the Free Software Foundation.
 */
 
-#include "../../includes.h"
+#include "includes.h"
 
 static inline void dummy(void){
 	struct proc_dir_entry *ent = proc_create("file", 0, NULL, NULL);
diff --git a/src/configure-tests/feature-tests/sb_start_write.c b/src/configure-tests/feature-tests/sb_start_write.c
index bf359fc..4343ed5 100644
--- a/src/configure-tests/feature-tests/sb_start_write.c
+++ b/src/configure-tests/feature-tests/sb_start_write.c
@@ -8,7 +8,7 @@
     by the Free Software Foundation.
 */
 
-#include "../../includes.h"
+#include "includes.h"
 
 static inline void dummy(void){
 	struct inode i;
diff --git a/src/configure-tests/feature-tests/struct_path.c b/src/configure-tests/feature-tests/struct_path.c
index 67a3a97..ebda979 100644
--- a/src/configure-tests/feature-tests/struct_path.c
+++ b/src/configure-tests/feature-tests/struct_path.c
@@ -8,7 +8,7 @@
     by the Free Software Foundation.
 */
 
-#include "../../includes.h"
+#include "includes.h"
 
 static inline void dummy(void){
 	struct path p;
diff --git a/src/configure-tests/feature-tests/submit_bio_1.c b/src/configure-tests/feature-tests/submit_bio_1.c
index ff7a945..751dd39 100644
--- a/src/configure-tests/feature-tests/submit_bio_1.c
+++ b/src/configure-tests/feature-tests/submit_bio_1.c
@@ -8,7 +8,7 @@
     by the Free Software Foundation.
 */
 
-#include "../../includes.h"
+#include "includes.h"
 
 static inline void dummy(void){
 	submit_bio(NULL);
diff --git a/src/configure-tests/feature-tests/submit_bio_wait.c b/src/configure-tests/feature-tests/submit_bio_wait.c
index 3847777..0d81f5d 100644
--- a/src/configure-tests/feature-tests/submit_bio_wait.c
+++ b/src/configure-tests/feature-tests/submit_bio_wait.c
@@ -8,7 +8,7 @@
     by the Free Software Foundation.
 */
 
-#include "../../includes.h"
+#include "includes.h"
 
 static inline void dummy(void){
 	struct bio bio;
diff --git a/src/configure-tests/feature-tests/sys_oldumount.c b/src/configure-tests/feature-tests/sys_oldumount.c
index 0e19ba2..5bd0364 100644
--- a/src/configure-tests/feature-tests/sys_oldumount.c
+++ b/src/configure-tests/feature-tests/sys_oldumount.c
@@ -8,7 +8,7 @@
     by the Free Software Foundation.
 */
 
-#include "../../includes.h"
+#include "includes.h"
 
 static inline int dummy(void){
 	return __NR_umount;
diff --git a/src/configure-tests/feature-tests/task_struct_task_works_cb_head.c b/src/configure-tests/feature-tests/task_struct_task_works_cb_head.c
index 042165d..141cfbb 100644
--- a/src/configure-tests/feature-tests/task_struct_task_works_cb_head.c
+++ b/src/configure-tests/feature-tests/task_struct_task_works_cb_head.c
@@ -8,7 +8,7 @@
     by the Free Software Foundation.
 */
 
-#include "../../includes.h"
+#include "includes.h"
 
 static inline void dummy(void){
 	struct callback_head *ch = current->task_works;
diff --git a/src/configure-tests/feature-tests/task_struct_task_works_hlist.c b/src/configure-tests/feature-tests/task_struct_task_works_hlist.c
index 8675b73..b2c5b5a 100644
--- a/src/configure-tests/feature-tests/task_struct_task_works_hlist.c
+++ b/src/configure-tests/feature-tests/task_struct_task_works_hlist.c
@@ -8,7 +8,7 @@
     by the Free Software Foundation.
 */
 
-#include "../../includes.h"
+#include "includes.h"
 
 static inline void dummy(void){
 	struct hlist_head *hl = current->task_works;
diff --git a/src/configure-tests/feature-tests/thaw_bdev_int.c b/src/configure-tests/feature-tests/thaw_bdev_int.c
index 6e6cf4c..93844da 100644
--- a/src/configure-tests/feature-tests/thaw_bdev_int.c
+++ b/src/configure-tests/feature-tests/thaw_bdev_int.c
@@ -8,7 +8,7 @@
     by the Free Software Foundation.
 */
 
-#include "../../includes.h"
+#include "includes.h"
 
 static inline void dummy(void){
 	struct block_device bd;
diff --git a/src/configure-tests/feature-tests/user_path_at.c b/src/configure-tests/feature-tests/user_path_at.c
index 8b83817..94b7f32 100644
--- a/src/configure-tests/feature-tests/user_path_at.c
+++ b/src/configure-tests/feature-tests/user_path_at.c
@@ -8,7 +8,7 @@
     by the Free Software Foundation.
 */
 
-#include "../../includes.h"
+#include "includes.h"
 
 static inline void dummy(void){
 	user_path_at(0, "dummy", 0, NULL);
diff --git a/src/configure-tests/feature-tests/uuid_h.c b/src/configure-tests/feature-tests/uuid_h.c
index 63bde51..9093100 100644
--- a/src/configure-tests/feature-tests/uuid_h.c
+++ b/src/configure-tests/feature-tests/uuid_h.c
@@ -8,7 +8,7 @@
     by the Free Software Foundation.
 */
 
-#include "../../includes.h"
+#include "includes.h"
 #include <linux/uuid.h>
 
 static inline void dummy(void){
diff --git a/src/configure-tests/feature-tests/vfs_fallocate.c b/src/configure-tests/feature-tests/vfs_fallocate.c
index b243e7d..6c894ff 100644
--- a/src/configure-tests/feature-tests/vfs_fallocate.c
+++ b/src/configure-tests/feature-tests/vfs_fallocate.c
@@ -8,7 +8,7 @@
     by the Free Software Foundation.
 */
 
-#include "../../includes.h"
+#include "includes.h"
 
 static inline void dummy(void){
 	struct file *f;
diff --git a/src/configure-tests/feature-tests/vfs_unlink_2.c b/src/configure-tests/feature-tests/vfs_unlink_2.c
index 263abcf..e268b77 100644
--- a/src/configure-tests/feature-tests/vfs_unlink_2.c
+++ b/src/configure-tests/feature-tests/vfs_unlink_2.c
@@ -8,7 +8,7 @@
     by the Free Software Foundation.
 */
 
-#include "../../includes.h"
+#include "includes.h"
 
 static inline void dummy(void){
 	struct inode i;
diff --git a/src/configure-tests/feature-tests/vzalloc.c b/src/configure-tests/feature-tests/vzalloc.c
index 448d2f9..299691e 100644
--- a/src/configure-tests/feature-tests/vzalloc.c
+++ b/src/configure-tests/feature-tests/vzalloc.c
@@ -8,7 +8,7 @@
     by the Free Software Foundation.
 */
 
-#include "../../includes.h"
+#include "includes.h"
 
 static inline void dummy(void){
 	vzalloc(0);