I should have addressed most of the issues pointed (while playing with git rebase -i more than I'm used to) the comment regardin removing the x86-specific header had been already addressed in patch 6 since in order to do that I need to complete the move first.