Fixed some inclusion. The code need a lot of clean-up !

Signed-off-by: Nemikolh <joan.varvenne@gmail.com>