Fixed redefiniton warnings from -include-all.php