Merge pull request #268 from benma/cleanup

Removed unused defines and u_header from stdafx.