Move stuff around, again

18 files changed, 19 insertions, 19 deletions

diff --git a/src/common/bam.lua b/src/common/bam.lua
index 8b302fa..6d4a29c 100644
--- a/src/common/bam.lua
+++ b/src/common/bam.lua
@@ -3,6 +3,5 @@ local function lib(name)
 	return Compile(common_settings, source) 
 end
 
-common_libalgo = lib('libalgo')
 common_libc = lib('libc')
 common_libkogata = lib('libkogata')
diff --git a/src/common/include/algo.h b/src/common/include/kogata/algo.h
index 80af052..80af052 100644
--- a/src/common/include/algo.h
+++ b/src/common/include/kogata/algo.h
diff --git a/src/common/include/btree.h b/src/common/include/kogata/btree.h
index a645d66..e796a2d 100644
--- a/src/common/include/btree.h
+++ b/src/common/include/kogata/btree.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <algo.h>
+#include <kogata/algo.h>
 
 // A btree may contain several bindings for the same key (in that case they are not ordered)
 //	- btree_find returns any item with matching key, or null if none exists
diff --git a/src/common/include/debug.h b/src/common/include/kogata/debug.h
index 2db5a80..2db5a80 100644
--- a/src/common/include/debug.h
+++ b/src/common/include/kogata/debug.h
diff --git a/src/common/include/hashtbl.h b/src/common/include/kogata/hashtbl.h
index b9c7178..e8f327c 100644
--- a/src/common/include/hashtbl.h
+++ b/src/common/include/kogata/hashtbl.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <algo.h>
+#include <kogata/algo.h>
 
 // Simple hashtable structure (key -> void*)
 // Supports adding, seeking, removing, iterating
diff --git a/src/common/include/malloc.h b/src/common/include/kogata/malloc.h
index e55c25e..e55c25e 100644
--- a/src/common/include/malloc.h
+++ b/src/common/include/kogata/malloc.h
diff --git a/src/common/include/mutex.h b/src/common/include/kogata/mutex.h
index 88c077e..88c077e 100644
--- a/src/common/include/mutex.h
+++ b/src/common/include/kogata/mutex.h
diff --git a/src/common/include/printf.h b/src/common/include/kogata/printf.h
index b4e1c1b..b4e1c1b 100644
--- a/src/common/include/printf.h
+++ b/src/common/include/kogata/printf.h
diff --git a/src/common/include/region_alloc.h b/src/common/include/kogata/region_alloc.h
index d314bd5..d314bd5 100644
--- a/src/common/include/region_alloc.h
+++ b/src/common/include/kogata/region_alloc.h
diff --git a/src/common/include/slab_alloc.h b/src/common/include/kogata/slab_alloc.h
index c8d5d6c..1191057 100644
--- a/src/common/include/slab_alloc.h
+++ b/src/common/include/kogata/slab_alloc.h
@@ -16,7 +16,7 @@
 #include <stdio.h> 
 #define dbg_printf printf
 #else
-#include <debug.h>
+#include <kogata/debug.h>
 #endif
 
 #define PAGE_SIZE 0x1000
diff --git a/src/common/libc/printf.c b/src/common/libc/printf.c
index 8618741..d1671c3 100644
--- a/src/common/libc/printf.c
+++ b/src/common/libc/printf.c
@@ -1,6 +1,7 @@
-#include <printf.h>
 #include <stdarg.h>
 
+#include <kogata/printf.h>
+
 int snprintf(char * buff, size_t len, const char *format, ...) {
 	va_list ap;
 
diff --git a/src/common/libc/string.c b/src/common/libc/string.c
index 90cea34..e1ed21e 100644
--- a/src/common/libc/string.c
+++ b/src/common/libc/string.c
@@ -1,6 +1,6 @@
 #include <string.h>
-#include <malloc.h>
 
+#include <kogata/malloc.h>
 
 size_t strlen(const char* str) {
 	size_t ret = 0;
diff --git a/src/common/libalgo/btree.c b/src/common/libkogata/btree.c
index d1bfd18..dc5f11f 100644
--- a/src/common/libalgo/btree.c
+++ b/src/common/libkogata/btree.c
@@ -1,7 +1,7 @@
-#include <malloc.h>
-#include <debug.h>
+#include <kogata/malloc.h>
+#include <kogata/debug.h>
 
-#include <btree.h>
+#include <kogata/btree.h>
 
 typedef struct btree_item {
 	void *key, *val;
diff --git a/src/common/libalgo/hashtbl.c b/src/common/libkogata/hashtbl.c
index 0284d75..b0097cd 100644
--- a/src/common/libalgo/hashtbl.c
+++ b/src/common/libkogata/hashtbl.c
@@ -1,7 +1,7 @@
-#include <debug.h>
-#include <malloc.h>
+#include <kogata/debug.h>
+#include <kogata/malloc.h>
 
-#include <hashtbl.h>
+#include <kogata/hashtbl.h>
 
 #define DEFAULT_HT_INIT_SIZE 16
 #define SLOT_OF_HASH(k, nslots) (((size_t)(k)*21179)%(size_t)(nslots))
diff --git a/src/common/libalgo/keyval.c b/src/common/libkogata/keyval.c
index 528fa90..9541c72 100644
--- a/src/common/libalgo/keyval.c
+++ b/src/common/libkogata/keyval.c
@@ -1,7 +1,7 @@
-#include <malloc.h>
 #include <string.h>
 
-#include <algo.h>
+#include <kogata/malloc.h>
+#include <kogata/algo.h>
 
 // Hashing and comparing
 
diff --git a/src/common/libkogata/mutex.c b/src/common/libkogata/mutex.c
index b345ee5..e521330 100644
--- a/src/common/libkogata/mutex.c
+++ b/src/common/libkogata/mutex.c
@@ -1,4 +1,4 @@
-#include <mutex.h>
+#include <kogata/mutex.h>
 
 /*	Internal use only. This function is atomic, meaning it cannot be interrupted by a system task switch. */
 static uint32_t atomic_exchange(uint32_t* ptr, uint32_t newval) {
diff --git a/src/common/libkogata/region_alloc.c b/src/common/libkogata/region_alloc.c
index 1f2fe0f..85c437a 100644
--- a/src/common/libkogata/region_alloc.c
+++ b/src/common/libkogata/region_alloc.c
@@ -1,6 +1,6 @@
-#include <region_alloc.h>
-#include <debug.h>
-#include <mutex.h>
+#include <kogata/region_alloc.h>
+#include <kogata/debug.h>
+#include <kogata/mutex.h>
 
 // we cannot include sys...
 
diff --git a/src/common/libkogata/slab_alloc.c b/src/common/libkogata/slab_alloc.c
index 0736655..6362207 100644
--- a/src/common/libkogata/slab_alloc.c
+++ b/src/common/libkogata/slab_alloc.c
@@ -1,4 +1,4 @@
-#include <slab_alloc.h>
+#include <kogata/slab_alloc.h>
 
 typedef struct object {
 	struct object *next;