Fix issue with undefined strings
Fix bug in yara-python
Remove unnecessary code
Fix issues with includes