fix to build system: #include the proper file when they are in both builds and src
Fix warning (line annotation)
Merge branch '1.0.x'