From bb80297c1e151944bcaa7a49072c5924339b2a41 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20Lov=C3=A9n?= <thomasloven@gmail.com>
Date: Sun, 23 Jan 2022 01:06:56 +0100
Subject: [PATCH] Consolidate internal and external libmittos headers

---
 src/libmittos/Makefile                        | 2 +-
 src/libmittos/graphics/graphics.c             | 2 +-
 src/libmittos/include/{ => mittos}/graphics.h | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)
 rename src/libmittos/include/{ => mittos}/graphics.h (97%)

diff --git a/src/libmittos/Makefile b/src/libmittos/Makefile
index 44f9a13..2b2bc16 100644
--- a/src/libmittos/Makefile
+++ b/src/libmittos/Makefile
@@ -31,7 +31,7 @@ $(OBJ): CPPFLAGS += $(DEPFLAGS)
 # Installation
 DESTDIR ?= $(BUILDROOT)/sysroot
 LIBDIR := $(DESTDIR)/usr/lib
-INCDIR := $(DESTDIR)/usr/include/mittos
+INCDIR := $(DESTDIR)/usr/include
 
 $(LIBDIR)/libmittos.a: libmittos.a
 	install -D $<  $@
diff --git a/src/libmittos/graphics/graphics.c b/src/libmittos/graphics/graphics.c
index 0b2859b..fc43bcb 100644
--- a/src/libmittos/graphics/graphics.c
+++ b/src/libmittos/graphics/graphics.c
@@ -1,7 +1,7 @@
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
-#include <graphics.h>
+#include <mittos/graphics.h>
 
 #define incptr(p, n) ((void *)(((uintptr_t)(p)) + (n)))
 
diff --git a/src/libmittos/include/graphics.h b/src/libmittos/include/mittos/graphics.h
similarity index 97%
rename from src/libmittos/include/graphics.h
rename to src/libmittos/include/mittos/graphics.h
index a89258e..496ef81 100644
--- a/src/libmittos/include/graphics.h
+++ b/src/libmittos/include/mittos/graphics.h
@@ -1,5 +1,6 @@
 #pragma once
 #include <stdlib.h>
+#include <stdint.h>
 
 typedef struct {
   uint32_t width;