Removed outdated headers (mentioned parts have been rewritten)
Fix compiling issue with some compilers / libcs