Restructured includes and improved building process