Further bugfix to db7e5d58 - fix double inclusion