Fixed hard coded definitions to the library files