Reduced the number of defines used in native source code