Include bugs gefixed