diff --git a/external/solanaceae_object_store b/external/solanaceae_object_store
index 889761f..76be873 160000
--- a/external/solanaceae_object_store
+++ b/external/solanaceae_object_store
@@ -1 +1 @@
-Subproject commit 889761f538eda8feb7ee0ea224c98e6ea05f6246
+Subproject commit 76be873fb80a566fa38411254efd3a13d28d2f0e
diff --git a/external/toxcore/CMakeLists.txt b/external/toxcore/CMakeLists.txt
index f802610..d831f22 100644
--- a/external/toxcore/CMakeLists.txt
+++ b/external/toxcore/CMakeLists.txt
@@ -28,16 +28,6 @@ else()
 endif()
 
 # HACK: "install" api headers into binary dir
-configure_file(
-	./c-toxcore/toxcore/tox_log_level.h
-	${CMAKE_CURRENT_BINARY_DIR}/include/tox/tox_log_level.h
-	@ONLY
-)
-configure_file(
-	./c-toxcore/toxcore/tox_options.h
-	${CMAKE_CURRENT_BINARY_DIR}/include/tox/tox_options.h
-	@ONLY
-)
 configure_file(
 	./c-toxcore/toxcore/tox.h
 	${CMAKE_CURRENT_BINARY_DIR}/include/tox/tox.h
@@ -48,6 +38,16 @@ configure_file(
 	${CMAKE_CURRENT_BINARY_DIR}/include/tox/tox_events.h
 	@ONLY
 )
+configure_file(
+	./c-toxcore/toxcore/tox_log_level.h
+	${CMAKE_CURRENT_BINARY_DIR}/include/tox/tox_log_level.h
+	@ONLY
+)
+configure_file(
+	./c-toxcore/toxcore/tox_options.h
+	${CMAKE_CURRENT_BINARY_DIR}/include/tox/tox_options.h
+	@ONLY
+)
 configure_file(
 	./c-toxcore/toxcore/tox_private.h
 	${CMAKE_CURRENT_BINARY_DIR}/include/tox/tox_private.h