diff --git a/cmake/generic.cmake b/cmake/generic.cmake
index 840155750e1ac6d59b43d0f35f41280bc117d880..69e8164a00d1fb57b79c63ba88c2846d30d80cd2 100644
--- a/cmake/generic.cmake
+++ b/cmake/generic.cmake
@@ -78,10 +78,6 @@
 #
 #   cc_test(example_test SRCS example_test.cc DEPS example glog gflags)
 
-if(WITH_GPU)
-  add_definitions(-DPADDLE_WITH_GPU)
-endif()
-
 if(NOT APPLE)
     find_package(Threads REQUIRED)
     link_libraries(${CMAKE_THREAD_LIBS_INIT})
diff --git a/paddle/memory/CMakeLists.txt b/paddle/memory/CMakeLists.txt
index e74ce75c9398d7a5662262c23626fd984863a68c..3943c3cfad31d13a00645aba6fc153d3d13da987 100644
--- a/paddle/memory/CMakeLists.txt
+++ b/paddle/memory/CMakeLists.txt
@@ -1,7 +1 @@
 add_subdirectory(detail)
-
-if(${WITH_GPU})
-  nv_library(memory SRCS memory.cc)
-else(${WITH_GPU})
-  cc_library(memory SRCS memory.cc)
-endif(${WITH_GPU})
diff --git a/paddle/memory/detail/buddy_allocator.cc b/paddle/memory/detail/buddy_allocator.cc
index 895bf319d778ac494bc3479116e45ecc82b998ae..ebe680f5eea4948339fb8c5584a5b9f5d71c752e 100644
--- a/paddle/memory/detail/buddy_allocator.cc
+++ b/paddle/memory/detail/buddy_allocator.cc
@@ -14,7 +14,7 @@
 
 #pragma once
 
-#include "paddle/memory/detail/system_allocator.h"
+#include "paddle/memory/detail/buddy_allocator.h"
 
 namespace paddle {
 namespace memory {
diff --git a/paddle/memory/detail/buddy_allocator.h b/paddle/memory/detail/buddy_allocator.h
index 129b137ed7386e77581db3added89ccfd6c871f1..702c7d28ee5f91b324e545e2e00ac3ed48b4bec0 100644
--- a/paddle/memory/detail/buddy_allocator.h
+++ b/paddle/memory/detail/buddy_allocator.h
@@ -16,6 +16,9 @@
 
 #include "paddle/memory/detail/system_allocator.h"
 
+#include <vector>
+#include <mutex>
+
 namespace paddle {
 namespace memory {
 namespace detail {