Restructured include files