diff --git a/include/fs/devfs/devfs.h b/include/fs/devfs/devfs.h
index 3e2ba65..03e0955 100644
--- a/include/fs/devfs/devfs.h
+++ b/include/fs/devfs/devfs.h
@@ -30,7 +30,7 @@
 #define _DEVFS_DEVFS_H
 
 #include <sys/types.h>
-#include <vfs/file.h>
+#include <sys/vfs/file.h>
 
 struct devfs_devices {
     struct devfs_devices *next;
diff --git a/include/net/arch.h b/include/net/arch.h
index da0a1d8..5cc97ae 100644
--- a/include/net/arch.h
+++ b/include/net/arch.h
@@ -48,7 +48,7 @@
 #include <sys/types.h>
 #include <net/arch/cc.h>
 #include <lib/kprintf.h>
-#include <ubixos/kpanic.h>
+#include <sys/ubixos/kpanic.h>
 
 /**
  * @defgroup compiler_abstraction Compiler/platform abstraction
diff --git a/include/net/arch/cc.h b/include/net/arch/cc.h
index e910ab9..2e99fc7 100644
--- a/include/net/arch/cc.h
+++ b/include/net/arch/cc.h
@@ -1,7 +1,7 @@
 #ifndef __ARCH_CC_H__
 #define __ARCH_CC_H__
 
-#include <ubixos/time.h>
+#include <sys/ubixos/time.h>
 
 #define PACK_STRUCT_FIELD(x) x __attribute__((packed))
 #define PACK_STRUCT_STRUCT __attribute__((packed))
diff --git a/include/sys/sysproto_posix.h b/include/sys/sysproto_posix.h
index 76ac7d0..2ac3c0b 100644
--- a/include/sys/sysproto_posix.h
+++ b/include/sys/sysproto_posix.h
@@ -34,7 +34,7 @@
 
 
 /* TEMP */
-#include <vfs/file.h>
+#include <sys/vfs/file.h>
 
 typedef int register_t;
 
diff --git a/include/sys/trap.h b/include/sys/trap.h
index 0b86020..cf7ebc5 100644
--- a/include/sys/trap.h
+++ b/include/sys/trap.h
@@ -29,7 +29,7 @@
 #ifndef _SYS_TRAP_H
 #define _SYS_TRAP_H
 
-#include <i386/cpu.h>
+#include <sys/i386/cpu.h>
 
 struct trapframe {
     int tf_gs;
diff --git a/include/sys/types.h b/include/sys/types.h
index 70d5723..4020cce 100644
--- a/include/sys/types.h
+++ b/include/sys/types.h
@@ -75,7 +75,12 @@
 typedef int pidType;
 
 typedef int pid_t;
-typedef int size_t; /* standart */
+
+#ifndef _SIZE_T_DECLARED
+typedef __size_t        size_t;
+#define _SIZE_T_DECLARED
+#endif
+
 
 #ifndef NOBOOL
 #ifndef __cplusplus
diff --git a/include/sys/vfs/file.h b/include/sys/vfs/file.h
index eee6c04..19f6df7 100644
--- a/include/sys/vfs/file.h
+++ b/include/sys/vfs/file.h
@@ -31,11 +31,11 @@
 
 #include <sys/types.h>
 
-#include <ubixfs/dirCache.h>
+#include <fs/ubixfs/dirCache.h>
 #include <sys/thread.h>
-#include <vfs/inode.h>
-#include <vfs/mount.h>
-#include <ufs/ufs.h>
+#include <sys/vfs/inode.h>
+#include <sys/vfs/mount.h>
+#include <fs/ufs/ufs.h>
 
 /* HACK */
 int getchar();
diff --git a/include/sys/vfs/inode.h b/include/sys/vfs/inode.h
index 7e6b1d1..baebb1a 100644
--- a/include/sys/vfs/inode.h
+++ b/include/sys/vfs/inode.h
@@ -30,11 +30,11 @@
 #define _VFS_INODE_H
 
 #include <sys/types.h>
-#include <ubixos/wait.h>
+#include <sys/ubixos/wait.h>
 
 #include <fs/pipe_fs.h>
 #include <fs/msdos_fs.h>
-#include <ufs/ufs.h>
+#include <fs/ufs/ufs.h>
 
 struct inode {
     __dev_t i_dev;
diff --git a/include/sys/vfs/vfs.h b/include/sys/vfs/vfs.h
index 3a48d5e..71c966d 100644
--- a/include/sys/vfs/vfs.h
+++ b/include/sys/vfs/vfs.h
@@ -29,12 +29,12 @@
 #define _VFS_VFS_H
 
 #include <sys/types.h>
-#include <vfs/file.h>
-#include <vfs/mount.h>
+#include <sys/vfs/file.h>
+#include <sys/vfs/mount.h>
 #include <sys/sysproto_posix.h>
 #include <sys/thread.h>
 #include <net/net.h>
-#include <ubixos/wait.h>
+#include <sys/ubixos/wait.h>
 
 #define MAY_EXEC 1
 #define MAY_WRITE 2
diff --git a/lib/objgfx40/objgfx40.cpp b/lib/objgfx40/objgfx40.cpp
index 5d867d0..0b6aca8 100644
--- a/lib/objgfx40/objgfx40.cpp
+++ b/lib/objgfx40/objgfx40.cpp
@@ -15,7 +15,7 @@
 extern "C" {
 #include <math.h>
 #include <lib/kmalloc.h>
-#include <vfs/vfs.h>
+#include <sys/vfs/vfs.h>
 #include <string.h>
 }
 
diff --git a/lib/objgfx40/ogFont.cpp b/lib/objgfx40/ogFont.cpp
index 38f74dc..0b21703 100644
--- a/lib/objgfx40/ogFont.cpp
+++ b/lib/objgfx40/ogFont.cpp
@@ -3,7 +3,7 @@
 
 extern "C" {
 #ifdef __UBIXOS_KERNEL__
-#include <vfs/file.h>
+#include <sys/vfs/file.h>
 #include <sys/types.h>
 #include <lib/kprintf.h>
 #else
diff --git a/sys/Makefile.incl b/sys/Makefile.incl
index 71ba64b..bf5137b 100644
--- a/sys/Makefile.incl
+++ b/sys/Makefile.incl
@@ -3,7 +3,7 @@
 KERNEL_CONF=${KERNEL_SRC}/${_ARCH}/conf
 KERNEL_NAME=kernel
 KERNEL_FLAGS=_ARCH=${_ARCH} CC="cc" CXX="c++" AS="as" AR="ar" LD="ld" NM=nm OBJDUMP= OBJCOPY="objcopy" RANLIB=ranlib
-KERNEL_INC=${KERNEL_SRC}/include
+KERNEL_INC=${KERNEL_SRC}/../include
 
 KMAKE= ${MAKE} ${KERNEL_FLAGS} INCLUDE=${KERNEL_INC} KERNEL=${KERNEL_NAME}
 
diff --git a/sys/fs/devfs/devfs.c b/sys/fs/devfs/devfs.c
index ffb764e..e96ba52 100644
--- a/sys/fs/devfs/devfs.c
+++ b/sys/fs/devfs/devfs.c
@@ -26,11 +26,11 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <devfs/devfs.h>
-#include <vfs/vfs.h>
+#include <fs/devfs/devfs.h>
+#include <sys/vfs/vfs.h>
 #include <sys/device.h>
-#include <ubixos/spinlock.h>
-#include <ubixos/kpanic.h>
+#include <sys/ubixos/spinlock.h>
+#include <sys/ubixos/kpanic.h>
 #include <lib/kmalloc.h>
 #include <string.h>
 #include <lib/kprintf.h>