Makefile and #include changes for linux