fix: Fixing type pun as there's no pun intended
add: Import some libraries as needed
Merge branch 'master' into opengl