diff --git a/src/libcharon/plugins/imv_test/imv_test_state.c b/src/libcharon/plugins/imv_test/imv_test_state.c
index fe1d6d38d..21d0c4c58 100644
--- a/src/libcharon/plugins/imv_test/imv_test_state.c
+++ b/src/libcharon/plugins/imv_test/imv_test_state.c
@@ -89,7 +89,7 @@ METHOD(imv_state_t, destroy, void,
 	free(this);
 }
 
-METHOD(imv_state_t, another_round, bool,
+METHOD(imv_test_state_t, another_round, bool,
 	private_imv_test_state_t *this)
 {
 	return (this->rounds-- > 0);
diff --git a/src/libtls/tls_reader.c b/src/libstrongswan/bio/bio_reader.c
similarity index 100%
rename from src/libtls/tls_reader.c
rename to src/libstrongswan/bio/bio_reader.c
diff --git a/src/libtls/tls_reader.h b/src/libstrongswan/bio/bio_reader.h
similarity index 100%
rename from src/libtls/tls_reader.h
rename to src/libstrongswan/bio/bio_reader.h
diff --git a/src/libtls/tls_writer.c b/src/libstrongswan/bio/bio_writer.c
similarity index 100%
rename from src/libtls/tls_writer.c
rename to src/libstrongswan/bio/bio_writer.c
diff --git a/src/libtls/tls_writer.h b/src/libstrongswan/bio/bio_writer.h
similarity index 100%
rename from src/libtls/tls_writer.h
rename to src/libstrongswan/bio/bio_writer.h