Added more library files
Modified makefile
Better preprocessor commands