Fixes for some of the recent movement in include file names and positions, also special math and regex additions. tested x86/linux -benjamin