diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt
index 029134d..2d63400 100644
--- a/external/CMakeLists.txt
+++ b/external/CMakeLists.txt
@@ -13,7 +13,7 @@ endif()
 if (NOT TARGET imgui)
 	FetchContent_Declare(imgui
 		GIT_REPOSITORY https://github.com/ocornut/imgui.git
-		GIT_TAG d6cb3c9 # v1.90.1
+		GIT_TAG 6ccc561 # v1.90.6
 		EXCLUDE_FROM_ALL
 	)
 
@@ -54,15 +54,6 @@ if (NOT TARGET imgui)
 	#FetchContent_MakeAvailable(imgui)
 endif()
 
-# TODO: move entt dep into solanaceae_contact
-if (NOT TARGET EnTT::EnTT)
-	FetchContent_Declare(EnTT
-		GIT_REPOSITORY https://github.com/skypjack/entt.git
-		GIT_TAG v3.12.2
-	)
-	FetchContent_MakeAvailable(EnTT)
-endif()
-
 if (NOT TARGET solanaceae_contact)
 	FetchContent_Declare(solanaceae_contact
 		GIT_REPOSITORY https://github.com/Green-Sky/solanaceae_contact.git
diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt
index 6c8553d..a57b13b 100644
--- a/plugins/CMakeLists.txt
+++ b/plugins/CMakeLists.txt
@@ -4,6 +4,11 @@ add_library(plugin_crdtnotes SHARED
 	./plugin_crdtnotes.cpp
 )
 target_compile_features(plugin_crdtnotes PUBLIC cxx_std_17)
+set_target_properties(plugin_crdtnotes PROPERTIES
+	C_VISIBILITY_PRESET hidden
+	POSITION_INDEPENDENT_CODE ON
+)
+target_compile_definitions(plugin_crdtnotes PUBLIC ENTT_API_IMPORT)
 target_link_libraries(plugin_crdtnotes PUBLIC
 	solanaceae_crdtnotes
 	solanaceae_plugin
@@ -15,6 +20,11 @@ add_library(plugin_crdtnotes_imgui SHARED
 	./plugin_crdtnotes_imgui.cpp
 )
 target_compile_features(plugin_crdtnotes_imgui PUBLIC cxx_std_17)
+set_target_properties(plugin_crdtnotes_imgui PROPERTIES
+	C_VISIBILITY_PRESET hidden
+	POSITION_INDEPENDENT_CODE ON
+)
+target_compile_definitions(plugin_crdtnotes_imgui PUBLIC ENTT_API_IMPORT)
 target_link_libraries(plugin_crdtnotes_imgui PUBLIC
 	solanaceae_crdtnotes_imgui
 	solanaceae_plugin
@@ -27,6 +37,11 @@ if (TARGET solanaceae_crdtnotes_toxsync)
 		./plugin_crdtnotes_toxsync.cpp
 	)
 	target_compile_features(plugin_crdtnotes_toxsync PUBLIC cxx_std_17)
+	set_target_properties(plugin_crdtnotes_toxsync PROPERTIES
+		C_VISIBILITY_PRESET hidden
+		POSITION_INDEPENDENT_CODE ON
+	)
+	target_compile_definitions(plugin_crdtnotes_toxsync PUBLIC ENTT_API_IMPORT)
 	target_link_libraries(plugin_crdtnotes_toxsync PUBLIC
 		solanaceae_crdtnotes_toxsync
 		solanaceae_plugin
diff --git a/plugins/plugin_crdtnotes.cpp b/plugins/plugin_crdtnotes.cpp
index 247244d..1ce1cd2 100644
--- a/plugins/plugin_crdtnotes.cpp
+++ b/plugins/plugin_crdtnotes.cpp
@@ -3,6 +3,9 @@
 #include <solanaceae/crdtnotes/crdtnotes.hpp>
 #include <solanaceae/crdtnotes/crdtnotes_sync.hpp>
 
+#include <entt/entt.hpp>
+#include <entt/fwd.hpp>
+
 #include <memory>
 #include <iostream>
 
diff --git a/plugins/plugin_crdtnotes_imgui.cpp b/plugins/plugin_crdtnotes_imgui.cpp
index 3f2deb1..ec24784 100644
--- a/plugins/plugin_crdtnotes_imgui.cpp
+++ b/plugins/plugin_crdtnotes_imgui.cpp
@@ -3,6 +3,9 @@
 #include <solanaceae/crdtnotes_imgui/crdtnotes_imgui.hpp>
 #include <imgui.h>
 
+#include <entt/entt.hpp>
+#include <entt/fwd.hpp>
+
 #include <memory>
 #include <limits>
 #include <iostream>
diff --git a/plugins/plugin_crdtnotes_toxsync.cpp b/plugins/plugin_crdtnotes_toxsync.cpp
index dd45560..70c8f6d 100644
--- a/plugins/plugin_crdtnotes_toxsync.cpp
+++ b/plugins/plugin_crdtnotes_toxsync.cpp
@@ -8,6 +8,9 @@
 #include <solanaceae/toxcore/tox_event_interface.hpp>
 #include <solanaceae/tox_contacts/tox_contact_model2.hpp>
 
+#include <entt/entt.hpp>
+#include <entt/fwd.hpp>
+
 #include <memory>
 #include <iostream>