Fixed recursive includes and return types bugs

Recursive includes are now available in the completion list.
Return type is no longer inserted when a completion is chosen.