diff --git a/README.md b/README.md
index 2674dec16..9be14f036 100644
--- a/README.md
+++ b/README.md
@@ -13,7 +13,7 @@ forge install foundry-rs/forge-std
 ## Contracts
 ### stdError
 
-This is a helper contract for errors and reverts. In Forge, this contract is particularly helpful for the `expectRevert` cheatcode, as it provides all compiler builtin errors.
+This is a helper contract for errors and reverts. In Forge, this contract is particularly helpful for the `expectRevert` cheatcode, as it provides all compiler built-in errors.
 
 See the contract itself for all error codes.
 
diff --git a/src/interfaces/IERC1155.sol b/src/interfaces/IERC1155.sol
index f7dd2b410..ffc82984a 100644
--- a/src/interfaces/IERC1155.sol
+++ b/src/interfaces/IERC1155.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity >=0.6.2;
 
-import "./IERC165.sol";
+import {IERC165} from "./IERC165.sol";
 
 /// @title ERC-1155 Multi Token Standard
 /// @dev See https://eips.ethereum.org/EIPS/eip-1155
diff --git a/src/interfaces/IERC4626.sol b/src/interfaces/IERC4626.sol
index 391eeb4de..c645a0fec 100644
--- a/src/interfaces/IERC4626.sol
+++ b/src/interfaces/IERC4626.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity >=0.6.2;
 
-import "./IERC20.sol";
+import {IERC20} from "./IERC20.sol";
 
 /// @dev Interface of the ERC4626 "Tokenized Vault Standard", as defined in
 /// https://eips.ethereum.org/EIPS/eip-4626
diff --git a/src/interfaces/IERC721.sol b/src/interfaces/IERC721.sol
index 0a16f45cc..21a4a94de 100644
--- a/src/interfaces/IERC721.sol
+++ b/src/interfaces/IERC721.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity >=0.6.2;
 
-import "./IERC165.sol";
+import {IERC165} from "./IERC165.sol";
 
 /// @title ERC-721 Non-Fungible Token Standard
 /// @dev See https://eips.ethereum.org/EIPS/eip-721
diff --git a/src/interfaces/IERC7540.sol b/src/interfaces/IERC7540.sol
index e42d1def7..91a38ca35 100644
--- a/src/interfaces/IERC7540.sol
+++ b/src/interfaces/IERC7540.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity >=0.6.2;
 
-import "./IERC7575.sol";
+import {IERC7575} from "./IERC7575.sol";
 
 /// @dev Interface of the base operator logic of ERC7540, as defined in
 /// https://eips.ethereum.org/EIPS/eip-7540
diff --git a/src/interfaces/IERC7575.sol b/src/interfaces/IERC7575.sol
index bbef052e9..207e3e7fe 100644
--- a/src/interfaces/IERC7575.sol
+++ b/src/interfaces/IERC7575.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity >=0.6.2;
 
-import "./IERC165.sol";
+import {IERC165} from "./IERC165.sol";
 
 /// @dev Interface of the ERC7575 "Multi-Asset ERC-4626 Vaults", as defined in
 /// https://eips.ethereum.org/EIPS/eip-7575
diff --git a/test/compilation/CompilationScript.sol b/test/compilation/CompilationScript.sol
index e205cfff3..d3d88a0b5 100644
--- a/test/compilation/CompilationScript.sol
+++ b/test/compilation/CompilationScript.sol
@@ -3,7 +3,7 @@ pragma solidity >=0.6.2 <0.9.0;
 
 pragma experimental ABIEncoderV2;
 
-import "../../src/Script.sol";
+import {Script} from "../../src/Script.sol";
 
 // The purpose of this contract is to benchmark compilation time to avoid accidentally introducing
 // a change that results in very long compilation times with via-ir. See https://github.com/foundry-rs/forge-std/issues/207
diff --git a/test/compilation/CompilationScriptBase.sol b/test/compilation/CompilationScriptBase.sol
index ce8e0e954..65b5bedbe 100644
--- a/test/compilation/CompilationScriptBase.sol
+++ b/test/compilation/CompilationScriptBase.sol
@@ -3,7 +3,7 @@ pragma solidity >=0.6.2 <0.9.0;
 
 pragma experimental ABIEncoderV2;
 
-import "../../src/Script.sol";
+import {ScriptBase} from "../../src/Script.sol";
 
 // The purpose of this contract is to benchmark compilation time to avoid accidentally introducing
 // a change that results in very long compilation times with via-ir. See https://github.com/foundry-rs/forge-std/issues/207
diff --git a/test/compilation/CompilationTest.sol b/test/compilation/CompilationTest.sol
index 9beeafeb7..2a9dec57f 100644
--- a/test/compilation/CompilationTest.sol
+++ b/test/compilation/CompilationTest.sol
@@ -3,7 +3,7 @@ pragma solidity >=0.6.2 <0.9.0;
 
 pragma experimental ABIEncoderV2;
 
-import "../../src/Test.sol";
+import {Test} from "../../src/Test.sol";
 
 // The purpose of this contract is to benchmark compilation time to avoid accidentally introducing
 // a change that results in very long compilation times with via-ir. See https://github.com/foundry-rs/forge-std/issues/207
diff --git a/test/compilation/CompilationTestBase.sol b/test/compilation/CompilationTestBase.sol
index e993535bc..32b3fc5be 100644
--- a/test/compilation/CompilationTestBase.sol
+++ b/test/compilation/CompilationTestBase.sol
@@ -3,7 +3,7 @@ pragma solidity >=0.6.2 <0.9.0;
 
 pragma experimental ABIEncoderV2;
 
-import "../../src/Test.sol";
+import {TestBase} from "../../src/Test.sol";
 
 // The purpose of this contract is to benchmark compilation time to avoid accidentally introducing
 // a change that results in very long compilation times with via-ir. See https://github.com/foundry-rs/forge-std/issues/207