Make constants externally accessible
Removed unneeded defines/guards