Removed some unnecessary includes that redeclare functions
Merge pull request #111 from laf/issue-110

Urgent: Resolves Global Search not working in some cases