diff --git a/CMakeLists.txt b/CMakeLists.txt
index 88398bdb3..db6918818 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -61,6 +61,7 @@ add_definitions(-DQT_NO_KEYWORDS -DQT_NO_EXCEPTIONS -DQT_NO_STL -DQT_STRICT_ITER
 add_gcc_compiler_flags("-fno-common -fstack-protector -D_FORTIFY_SOURCE=2")
 add_gcc_compiler_flags("-Wall -Wextra -Wundef -Wpointer-arith -Wno-long-long")
 add_gcc_compiler_flags("-Wformat=2 -Wmissing-format-attribute")
+add_gcc_compiler_flags("-fvisibility=hidden -fvisibility-inlines-hidden")
 
 add_gcc_compiler_cxxflags("-fno-exceptions -fno-rtti")
 add_gcc_compiler_cxxflags("-Wnon-virtual-dtor -Wold-style-cast -Woverloaded-virtual")
diff --git a/src/core/Global.h b/src/core/Global.h
index b69760605..cb9cf5df7 100644
--- a/src/core/Global.h
+++ b/src/core/Global.h
@@ -125,7 +125,7 @@ template <> class QStaticAssertFailure<true> {};
 #    define KEEPASSX_EXPORT Q_DECL_IMPORT
 #  endif
 #else
-#  define KEEPASSX_EXPORT
+#  define KEEPASSX_EXPORT Q_DECL_EXPORT
 #endif
 
 #endif // KEEPASSX_GLOBAL_H