Fixed preprocessor problems with headers inclusion