Fixed some headers for g++ compilation