[trunk] clean up redundant includes already handled in opj_includes.h