Fixed code typos that prevent compiling on OS X#7

Open

zedrdave wants to merge 4 commits intofrsyuki:masterfrom

zedrdave:master

Commits on Dec 1, 2014

Commits on Dec 2, 2014

Using full .hpp suffix for memory include
zedrdave
committed