Migrated common define's up here
Use new config.h