Remove not needed includes
Remove not needed includes in Query.h
Move implementations out of the header
Move includes from global headers into local .cpp