Fix includes for g++
Remove warnings