diff --git a/libdevcrypto/All.h b/libdevcrypto/All.h
deleted file mode 100644
index 9070725e9..000000000
--- a/libdevcrypto/All.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#pragma once
-
-#include "Common.h"
-#include "AES.h"
-#include "ECDHE.h"
-#include "FileSystem.h"
-#include "SHA3.h"
-#include "TrieDB.h"
diff --git a/libdevcrypto/CMakeLists.txt b/libdevcrypto/CMakeLists.txt
index 354053483..c0fa56026 100644
--- a/libdevcrypto/CMakeLists.txt
+++ b/libdevcrypto/CMakeLists.txt
@@ -9,6 +9,7 @@ set(CMAKE_AUTOMOC OFF)
 
 aux_source_directory(. SRC_LIST)
 
+include_directories(${Boost_INCLUDE_DIRS})
 include_directories(${CRYPTOPP_INCLUDE_DIRS})
 include_directories(${LEVELDB_INCLUDE_DIRS})
 include_directories(..) 
@@ -26,7 +27,6 @@ target_link_libraries(${EXECUTABLE} ${Boost_FILESYSTEM_LIBRARY_RELEASE})
 target_link_libraries(${EXECUTABLE} ${LEVELDB_LIBRARIES})
 target_link_libraries(${EXECUTABLE} ${CRYPTOPP_LIBRARIES})
 target_link_libraries(${EXECUTABLE} devcore)
-target_link_libraries(${EXECUTABLE} secp256k1)
 
 install( TARGETS ${EXECUTABLE} ARCHIVE DESTINATION lib LIBRARY DESTINATION lib )
 install( FILES ${HEADERS} DESTINATION include/${EXECUTABLE} )
diff --git a/libethcore/CommonEth.cpp b/libethcore/CommonEth.cpp
index 36726dae4..5e510572e 100644
--- a/libethcore/CommonEth.cpp
+++ b/libethcore/CommonEth.cpp
@@ -21,7 +21,6 @@
 
 #include "CommonEth.h"
 #include <random>
-#include <secp256k1/secp256k1.h>
 #include <libdevcrypto/SHA3.h>
 #include "Exceptions.h"
 using namespace std;