Merge the ls_defines.h headers into the common sub-library