Merge the ls_defines.h headers into the common sub-library
Merge pull request #235 from mstorsjo/merge-ls-defines

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