Bump X Input Protocol headers to 2.3.1
Add automake 1.13 at 1.13.4