changed includes - this might fix some problems some people are reporting