Clean up conditional inclusion
Simplify version generation in Makefile