tweaking some includes