7 files changed, 35 insertions, 21 deletions
diff --git a/src/common/include/framebuffer.h b/src/common/include/framebuffer.h
deleted file mode 100644
index febbfaa..0000000
--- a/src/common/include/framebuffer.h
+++ /dev/null
@@ -1,19 +0,0 @@
-#pragma once
-
-typedef struct {
-	uint32_t width, height;
-	uint32_t pitch;		// bytes per line
-	uint32_t bpp;
-} framebuffer_info_t;
-
-typedef struct {
-	int mode_number;
-	framebuffer_info_t geom;
-} fbdev_mode_info_t;
-
-#define IOCTL_FBDEV_GET_MODE_INFO	10
-#define IOCTL_FBDEV_SET_MODE		11
-
-#define IOCTL_FB_GET_INFO			12
-
-/* vim: set ts=4 sw=4 tw=0 noet :*/
diff --git a/src/common/include/proto/fb.h b/src/common/include/proto/fb.h
new file mode 100644
index 0000000..0519554
--- /dev/null
+++ b/src/common/include/proto/fb.h
@@ -0,0 +1,33 @@
+#pragma once
+
+// Framebuffer-related data structures
+
+#include <stdint.h>
+#include <stddef.h>
+
+#define FB_MM_RGB16		1		// 2 bytes (16 bits) per pixel, blue 0-4, green 5-9, red 10-14
+#define FB_MM_BGR16		2		// 2 bytes (16 bits) per pixel, red 0-4, green 5-9, blue 10-14
+#define FB_MM_RGB24		3		// 3 bytes (24 bits) per pixel, blue 0-7, green 8-15, red 16-23
+#define FB_MM_BGR24		4		// 3 bytes (24 bits) per pixel, red 0-7, green 8-15, blue 16-23
+#define FB_MM_RGB32		5		// 4 bytes (32 bits) per pixel, blue 0-7, green 8-15, red 16-23
+#define FB_MM_BGR32		6		// 4 bytes (32 bits) per pixel, red 0-7, green 8-15, blue 16-23
+#define FB_MM_GREY8		10		// 1 byte (8 bits) per pixel greyscale
+
+typedef struct {
+	uint32_t width, height;
+	uint32_t pitch;		// bytes per line
+	uint32_t bpp;
+	uint32_t memory_model;
+} framebuffer_info_t;
+
+typedef struct {
+	int mode_number;
+	framebuffer_info_t geom;
+} fbdev_mode_info_t;
+
+#define IOCTL_FBDEV_GET_MODE_INFO	10
+#define IOCTL_FBDEV_SET_MODE		11
+
+#define IOCTL_FB_GET_INFO			12
+
+/* vim: set ts=4 sw=4 tw=0 noet :*/
diff --git a/src/common/include/fs.h b/src/common/include/proto/fs.h
index e70ff55..e70ff55 100644
--- a/src/common/include/fs.h
+++ b/src/common/include/proto/fs.h
diff --git a/src/common/include/mmap.h b/src/common/include/proto/mmap.h
index 3134403..3134403 100644
--- a/src/common/include/mmap.h
+++ b/src/common/include/proto/mmap.h
diff --git a/src/common/include/proc.h b/src/common/include/proto/proc.h
index 29b5b91..29b5b91 100644
--- a/src/common/include/proc.h
+++ b/src/common/include/proto/proc.h
diff --git a/src/common/include/syscallproto.h b/src/common/include/proto/syscall.h
index 9f300d3..a671c65 100644
--- a/src/common/include/syscallproto.h
+++ b/src/common/include/proto/syscall.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <proc.h>
-#include <fs.h>
+#include <proto/proc.h>
+#include <proto/fs.h>
 
 typedef struct { fd_t a, b; } fd_pair_t;
 
diff --git a/src/common/include/token.h b/src/common/include/proto/token.h
index 9ec1aff..9ec1aff 100644
--- a/src/common/include/token.h
+++ b/src/common/include/proto/token.h