Use a single command to install all includes
Simplify argument count check
Use the latest shell includes

Fixes an issue with printing error messages.