Add branch for the conversion of demos to use standard C header files for configuration, rather than makefile defined macros.