[TASK] Fix a couple hundred CGL and declaration issues
Merge pull request #657 from NamelessCoder/cgl

[TASK] Fix a couple hundred CGL and declaration issues