#67: static include functions plus tests