Some includes reestructuration