Fixed and improved static includes