One other thing in terms of organization. Your makefile should place any .o files in a separate directory, not in the source directory. This helps keep your source directory clean, and extends nicely when you want to have multiple different builds with different options.