Splitted includes
Added errors