Fix positive trim values for delta M666, cleanup various header files