fixed includes
fixed config