Move classes to separated modules and add possibility to include/exclude them using defines. This will help easily swith between pure C and C++.