diff --git a/repos/libports/lib/mk/vfs_libusb.mk b/repos/libports/lib/mk/vfs_libusb.mk
index 1a794b2444..0ac7749586 100644
--- a/repos/libports/lib/mk/vfs_libusb.mk
+++ b/repos/libports/lib/mk/vfs_libusb.mk
@@ -5,5 +5,3 @@ LIBS += libusb
 vpath %.cc $(REP_DIR)/src/lib/vfs/libusb
 
 SHARED_LIB = yes
-
-CC_CXX_WARN_STRICT =
diff --git a/repos/libports/run/smartcard.run b/repos/libports/run/smartcard.run
index 27df436400..b6a9ae3cc4 100644
--- a/repos/libports/run/smartcard.run
+++ b/repos/libports/run/smartcard.run
@@ -109,12 +109,7 @@ set fd [open [run_dir]/genode/usb_host_drv.config w]
 puts $fd $usb_config
 close $fd
 
-build_boot_image {
-	test-smartcard
-	ld.lib.so pcsc-lite.lib.so ccid.lib.so libusb.lib.so
-	libc.lib.so vfs.lib.so libm.lib.so posix.lib.so
-	Info.plist vfs_libusb.lib.so vfs_pipe.lib.so
-}
+build_boot_image "[build_artifacts] Info.plist"
 
 run_genode_until { Response: 62 0A 82 01 38 83 02 3F 00 8A 01 05 90 00} 30
 
diff --git a/repos/libports/src/lib/vfs/libusb/vfs_libusb.cc b/repos/libports/src/lib/vfs/libusb/vfs_libusb.cc
index 5d84e59387..69e3e87a95 100644
--- a/repos/libports/src/lib/vfs/libusb/vfs_libusb.cc
+++ b/repos/libports/src/lib/vfs/libusb/vfs_libusb.cc
@@ -39,7 +39,6 @@ class Libusb_file_system : public Vfs::Single_file_system
 				Genode::Env           &_env;
 				Vfs::Env::User        &_vfs_user;
 				Genode::Allocator_avl  _alloc_avl;
-				Usb::Connection        _usb_connection;
 
 				Genode::Io_signal_handler<Libusb_vfs_handle> _state_changed_handler {
 					_env.ep(), *this, &Libusb_vfs_handle::_handle_state_changed };
@@ -53,6 +52,9 @@ class Libusb_file_system : public Vfs::Single_file_system
 					 */
 				}
 
+				Usb::Connection _usb_connection {
+					_env, &_alloc_avl, "usb_device", 1024*1024, _state_changed_handler };
+
 				Genode::Io_signal_handler<Libusb_vfs_handle> _ack_avail_handler {
 					_env.ep(), *this, &Libusb_vfs_handle::_handle_ack_avail };
 
@@ -70,11 +72,7 @@ class Libusb_file_system : public Vfs::Single_file_system
 				                  Vfs::Env::User    &vfs_user)
 				:
 					Single_vfs_handle(ds, fs, alloc, 0),
-					_env(env), _vfs_user(vfs_user), _alloc_avl(&alloc),
-					_usb_connection(_env, &_alloc_avl,
-					                "usb_device",
-					                1024*1024,
-					                _state_changed_handler)
+					_env(env), _vfs_user(vfs_user), _alloc_avl(&alloc)
 				{
 					_usb_connection.tx_channel()->sigh_ack_avail(_ack_avail_handler);
 					libusb_genode_usb_connection(&_usb_connection);