Move to basic ANSI C