Ondokuz / fixincludes

Fix non-ANSI header files