Proper code inclusion, fixed global links