Use fully qualified path for OSI includes.

17 files changed, 61 insertions, 61 deletions

diff --git a/osi/src/alarm.c b/osi/src/alarm.c
index cf2246c52..1b2e7e5c2 100644
--- a/osi/src/alarm.c
+++ b/osi/src/alarm.c
@@ -24,10 +24,10 @@
 #include <inttypes.h>
 #include <time.h>
 
-#include "allocator.h"
-#include "alarm.h"
-#include "list.h"
-#include "osi.h"
+#include "osi/include/allocator.h"
+#include "osi/include/alarm.h"
+#include "osi/include/list.h"
+#include "osi/include/osi.h"
 #include "osi/include/log.h"
 
 struct alarm_t {
diff --git a/osi/src/allocation_tracker.c b/osi/src/allocation_tracker.c
index 082127620..c6a430301 100644
--- a/osi/src/allocation_tracker.c
+++ b/osi/src/allocation_tracker.c
@@ -22,11 +22,11 @@
 #include <pthread.h>
 #include <stdint.h>
 
-#include "allocation_tracker.h"
-#include "allocator.h"
-#include "hash_functions.h"
-#include "hash_map.h"
-#include "osi.h"
+#include "osi/include/allocation_tracker.h"
+#include "osi/include/allocator.h"
+#include "osi/include/hash_functions.h"
+#include "osi/include/hash_map.h"
+#include "osi/include/osi.h"
 #include "osi/include/log.h"
 
 typedef struct {
diff --git a/osi/src/allocator.c b/osi/src/allocator.c
index 27080c717..cd291b049 100644
--- a/osi/src/allocator.c
+++ b/osi/src/allocator.c
@@ -18,8 +18,8 @@
 
 #include <stdlib.h>
 
-#include "allocator.h"
-#include "allocation_tracker.h"
+#include "osi/include/allocator.h"
+#include "osi/include/allocation_tracker.h"
 
 static const allocator_id_t alloc_allocator_id = 42;
 
diff --git a/osi/src/array.c b/osi/src/array.c
index c9416f036..33fa38cce 100644
--- a/osi/src/array.c
+++ b/osi/src/array.c
@@ -20,8 +20,8 @@
 
 #include <assert.h>
 
-#include "allocator.h"
-#include "array.h"
+#include "osi/include/allocator.h"
+#include "osi/include/array.h"
 #include "osi/include/log.h"
 
 struct array_t {
diff --git a/osi/src/config.c b/osi/src/config.c
index 5f17299c5..1944bb30c 100644
--- a/osi/src/config.c
+++ b/osi/src/config.c
@@ -24,9 +24,9 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "allocator.h"
-#include "config.h"
-#include "list.h"
+#include "osi/include/allocator.h"
+#include "osi/include/config.h"
+#include "osi/include/list.h"
 #include "osi/include/log.h"
 
 typedef struct {
diff --git a/osi/src/data_dispatcher.c b/osi/src/data_dispatcher.c
index 5d2b5065a..4f27f8a91 100644
--- a/osi/src/data_dispatcher.c
+++ b/osi/src/data_dispatcher.c
@@ -20,11 +20,11 @@
 
 #include <assert.h>
 
-#include "allocator.h"
-#include "data_dispatcher.h"
-#include "hash_functions.h"
-#include "hash_map.h"
-#include "osi.h"
+#include "osi/include/allocator.h"
+#include "osi/include/data_dispatcher.h"
+#include "osi/include/hash_functions.h"
+#include "osi/include/hash_map.h"
+#include "osi/include/osi.h"
 #include "osi/include/log.h"
 
 #define DEFAULT_TABLE_BUCKETS 10
diff --git a/osi/src/eager_reader.c b/osi/src/eager_reader.c
index 5cd76149a..887fe1a38 100644
--- a/osi/src/eager_reader.c
+++ b/osi/src/eager_reader.c
@@ -23,13 +23,13 @@
 #include <stddef.h>
 #include <sys/eventfd.h>
 
-#include "allocator.h"
-#include "eager_reader.h"
-#include "fixed_queue.h"
-#include "osi.h"
+#include "osi/include/allocator.h"
+#include "osi/include/eager_reader.h"
+#include "osi/include/fixed_queue.h"
+#include "osi/include/osi.h"
 #include "osi/include/log.h"
-#include "reactor.h"
-#include "thread.h"
+#include "osi/include/reactor.h"
+#include "osi/include/thread.h"
 
 #if !defined(EFD_SEMAPHORE)
 #  define EFD_SEMAPHORE (1 << 0)
diff --git a/osi/src/fixed_queue.c b/osi/src/fixed_queue.c
index 1a3253787..009e18537 100644
--- a/osi/src/fixed_queue.c
+++ b/osi/src/fixed_queue.c
@@ -20,12 +20,12 @@
 #include <pthread.h>
 #include <stdlib.h>
 
-#include "allocator.h"
-#include "fixed_queue.h"
-#include "list.h"
-#include "osi.h"
-#include "semaphore.h"
-#include "reactor.h"
+#include "osi/include/allocator.h"
+#include "osi/include/fixed_queue.h"
+#include "osi/include/list.h"
+#include "osi/include/osi.h"
+#include "osi/include/semaphore.h"
+#include "osi/include/reactor.h"
 
 typedef struct fixed_queue_t {
   list_t *list;
diff --git a/osi/src/future.c b/osi/src/future.c
index bfe8db26e..230218fa2 100644
--- a/osi/src/future.c
+++ b/osi/src/future.c
@@ -20,11 +20,11 @@
 
 #include <assert.h>
 
-#include "allocator.h"
-#include "future.h"
-#include "osi.h"
+#include "osi/include/allocator.h"
+#include "osi/include/future.h"
+#include "osi/include/osi.h"
 #include "osi/include/log.h"
-#include "semaphore.h"
+#include "osi/include/semaphore.h"
 
 struct future_t {
   bool ready_can_be_called;
diff --git a/osi/src/hash_functions.c b/osi/src/hash_functions.c
index f279bd456..e7e7cefb7 100644
--- a/osi/src/hash_functions.c
+++ b/osi/src/hash_functions.c
@@ -18,7 +18,7 @@
 
 #include <string.h>
 
-#include "hash_functions.h"
+#include "osi/include/hash_functions.h"
 
 hash_index_t hash_function_naive(const void *key) {
   return (hash_index_t)key;
diff --git a/osi/src/hash_map.c b/osi/src/hash_map.c
index 4581f98d2..6d36ec3a1 100644
--- a/osi/src/hash_map.c
+++ b/osi/src/hash_map.c
@@ -20,7 +20,7 @@
 #include <list.h>
 #include <hash_map.h>
 
-#include "allocator.h"
+#include "osi/include/allocator.h"
 
 struct hash_map_t;
 
diff --git a/osi/src/list.c b/osi/src/list.c
index 5c38a8f31..a9701aacc 100644
--- a/osi/src/list.c
+++ b/osi/src/list.c
@@ -1,8 +1,8 @@
 #include <assert.h>
 
-#include "allocator.h"
-#include "list.h"
-#include "osi.h"
+#include "osi/include/allocator.h"
+#include "osi/include/list.h"
+#include "osi/include/osi.h"
 
 typedef struct list_node_t {
   struct list_node_t *next;
diff --git a/osi/src/non_repeating_timer.c b/osi/src/non_repeating_timer.c
index 0c32e3d14..e5e95d4ea 100644
--- a/osi/src/non_repeating_timer.c
+++ b/osi/src/non_repeating_timer.c
@@ -18,9 +18,9 @@
 
 #include <assert.h>
 
-#include "allocator.h"
-#include "osi.h"
-#include "non_repeating_timer.h"
+#include "osi/include/allocator.h"
+#include "osi/include/osi.h"
+#include "osi/include/non_repeating_timer.h"
 
 struct non_repeating_timer_t {
   alarm_t *alarm;
diff --git a/osi/src/reactor.c b/osi/src/reactor.c
index 72a47ec6e..968fe4bba 100644
--- a/osi/src/reactor.c
+++ b/osi/src/reactor.c
@@ -25,10 +25,10 @@
 #include <sys/epoll.h>
 #include <sys/eventfd.h>
 
-#include "allocator.h"
-#include "list.h"
+#include "osi/include/allocator.h"
+#include "osi/include/list.h"
 #include "osi/include/log.h"
-#include "reactor.h"
+#include "osi/include/reactor.h"
 
 #if !defined(EFD_SEMAPHORE)
 #  define EFD_SEMAPHORE (1 << 0)
diff --git a/osi/src/semaphore.c b/osi/src/semaphore.c
index e1fa8a42c..4c45b2e5e 100644
--- a/osi/src/semaphore.c
+++ b/osi/src/semaphore.c
@@ -24,10 +24,10 @@
 #include <string.h>
 #include <sys/eventfd.h>
 
-#include "allocator.h"
-#include "osi.h"
+#include "osi/include/allocator.h"
+#include "osi/include/osi.h"
 #include "osi/include/log.h"
-#include "semaphore.h"
+#include "osi/include/semaphore.h"
 
 #if !defined(EFD_SEMAPHORE)
 #  define EFD_SEMAPHORE (1 << 0)
diff --git a/osi/src/socket.c b/osi/src/socket.c
index 8a1a75edf..8841d5605 100644
--- a/osi/src/socket.c
+++ b/osi/src/socket.c
@@ -28,11 +28,11 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#include "allocator.h"
-#include "osi.h"
+#include "osi/include/allocator.h"
+#include "osi/include/osi.h"
 #include "osi/include/log.h"
-#include "reactor.h"
-#include "socket.h"
+#include "osi/include/reactor.h"
+#include "osi/include/socket.h"
 
 struct socket_t {
   int fd;
diff --git a/osi/src/thread.c b/osi/src/thread.c
index 33c324a5c..d60968b01 100644
--- a/osi/src/thread.c
+++ b/osi/src/thread.c
@@ -25,12 +25,12 @@
 #include <sys/prctl.h>
 #include <sys/types.h>
 
-#include "allocator.h"
-#include "fixed_queue.h"
-#include "log.h"
-#include "reactor.h"
-#include "semaphore.h"
-#include "thread.h"
+#include "osi/include/allocator.h"
+#include "osi/include/fixed_queue.h"
+#include "osi/include/log.h"
+#include "osi/include/reactor.h"
+#include "osi/include/semaphore.h"
+#include "osi/include/thread.h"
 
 struct thread_t {
   bool is_joined;