5 files changed, 6 insertions, 19 deletions
diff --git a/src/gpg/CMakeLists.txt b/src/gpg/CMakeLists.txt
index f0c4c72e..693b9147 100644
--- a/src/gpg/CMakeLists.txt
+++ b/src/gpg/CMakeLists.txt
@@ -9,27 +9,20 @@ set(UTILS_DIR ${CMAKE_SOURCE_DIR}/utils)
 
 set(GPGME_LIB_DIR ${UTILS_DIR}/gpgme/lib)
 
-if (EASY_LOGGING_PP)
-    set(THIRD_PARTY_LIBS ${THIRD_PARTY_LIBS} easy_logging_pp)
-endif ()
-set(THIRD_PARTY_LIBS ${THIRD_PARTY_LIBS} config++)
-
+set(THIRD_PARTY_LIBS easyloggingpp config++)
 set(BOOST_LIBS Boost::date_time Boost::filesystem)
 
 if (MINGW)
     message(STATUS "Link GPG Static Library For MINGW")
     target_link_libraries(gpgfrontend_core ${THIRD_PARTY_LIBS}
             ${BOOST_LIBS}
-            gpgme gpg-error assuan wsock32)
+            gpgme assuan gpg-error wsock32)
     target_compile_features(gpgfrontend_core PUBLIC cxx_std_17)
 elseif (APPLE)
-    find_library(libgpgme NAMES libgpgme.a)
-    find_library(libgpg-error NAMES libgpg-error.a)
-    find_library(libassuan NAMES libassuan.a)
     message(STATUS "Link GPG Static Library For macOS")
     target_link_libraries(gpgfrontend_core ${THIRD_PARTY_LIBS}
+            gpgme assuan gpg-error
             ${BOOST_LIBS}
-            ${libgpgme} ${libgpg-error} ${libassuan}
             dl)
     if (XCODE_BUILD)
         set_target_properties(gpgfrontend_core
@@ -39,12 +32,9 @@ elseif (APPLE)
                 LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_BUILD_TYPE})
     endif ()
 else ()
-    find_library(libgpgme NAMES libgpgme.a)
-    find_library(libgpg-error NAMES libgpg-error.a)
-    find_library(libassuan NAMES libassuan.a)
     message(STATUS "Link GPG Static Library For Unix")
     target_link_libraries(gpgfrontend_core ${THIRD_PARTY_LIBS}
-            ${libgpgme} ${libgpg-error} ${libassuan}
+            gpgme assuan gpg-error
             ${BOOST_LIBS}
             pthread dl)
 endif ()
diff --git a/src/gpg/GpgConstants.h b/src/gpg/GpgConstants.h
index d2f9b0b6..9ac0d7ad 100644
--- a/src/gpg/GpgConstants.h
+++ b/src/gpg/GpgConstants.h
@@ -25,7 +25,6 @@
 #ifndef GPG_CONSTANTS_H
 #define GPG_CONSTANTS_H
 
-#include <gpg-error.h>
 #include <gpgme.h>
 
 #include <cassert>
diff --git a/src/gpg/GpgFunctionObject.h b/src/gpg/GpgFunctionObject.h
index 404b2f84..9a2273d7 100644
--- a/src/gpg/GpgFunctionObject.h
+++ b/src/gpg/GpgFunctionObject.h
@@ -25,8 +25,6 @@
 #ifndef GPGFRONTEND_ZH_CN_TS_FUNCTIONOBJECT_H
 #define GPGFRONTEND_ZH_CN_TS_FUNCTIONOBJECT_H
 
-#include <easyloggingpp/easylogging++.h>
-
 #include <map>
 #include <memory>
 #include <mutex>
diff --git a/src/gpg/GpgGenKeyInfo.cpp b/src/gpg/GpgGenKeyInfo.cpp
index f67aaa1f..1274421d 100644
--- a/src/gpg/GpgGenKeyInfo.cpp
+++ b/src/gpg/GpgGenKeyInfo.cpp
@@ -24,8 +24,6 @@
 
 #include "gpg/GpgGenKeyInfo.h"
 
-#include <easyloggingpp/easylogging++.h>
-
 #include <boost/date_time/gregorian/greg_date.hpp>
 #include <boost/date_time/gregorian/greg_duration.hpp>
 #include <boost/date_time/gregorian/gregorian_types.hpp>
diff --git a/src/gpg/GpgGenKeyInfo.h b/src/gpg/GpgGenKeyInfo.h
index 8f7d19ea..89030b15 100644
--- a/src/gpg/GpgGenKeyInfo.h
+++ b/src/gpg/GpgGenKeyInfo.h
@@ -31,6 +31,8 @@
 #include <string>
 #include <vector>
 
+#include "GpgFrontend.h"
+
 namespace GpgFrontend {
 
 class GenKeyInfo {