Fixing preliminary include files