a few more header files fixes, plus cleanup from nick_m, and the start of Action...