Removed extra includes. Fixed one connection.