updated header includes [fixes #343]