Remove third_party libraries modifications and fix compilation. #2