Feature/rm cincludes

We had several suggestions how to remove the included c-files, I propose this solution...