switched the order of a couple of includes to fix bugs #97100 Daniel * Makefile.am: switched the order of a couple of includes to fix bugs #97100 Daniel