Bug 996738 - Change #define to const int to work better with unified builds. r=mattwoodrow
Bug 996742 - Remove unused forward declare in the wrong namespace. r=nrc