diff --git a/Makefile.in b/Makefile.in
index cebc67a91..fdc785945 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -204,6 +204,7 @@ VL_INST_INC_BLDDIR_FILES = \
 # Files under srcdir, instead of build time
 VL_INST_INC_SRCDIR_FILES = \
 	include/*.[chv]* \
+	include/*.sv \
 	include/gtkwave/*.[chv]* \
 	include/vltstd/*.[chv]* \
 
diff --git a/include/std.sv b/include/verilated_std.sv
similarity index 89%
rename from include/std.sv
rename to include/verilated_std.sv
index 7b27bc98b..996bc951b 100644
--- a/include/std.sv
+++ b/include/verilated_std.sv
@@ -10,6 +10,17 @@
 // SPDX-License-Identifier: LGPL-3.0-only OR Artistic-2.0
 //
 //*************************************************************************
+///
+/// \file
+/// \brief Verilated IEEE std:: header
+///
+/// This file is included automatically by Verilator when a std::mailbox or
+/// std::semaphore is referenced.
+///
+/// This file is not part of the Verilated public-facing API.
+/// It is only for internal use.
+///
+//*************************************************************************
 
 // verilator lint_off DECLFILENAME
 // verilator lint_off TIMESCALEMOD
diff --git a/src/V3Global.cpp b/src/V3Global.cpp
index 73b083d83..c75b51785 100644
--- a/src/V3Global.cpp
+++ b/src/V3Global.cpp
@@ -67,7 +67,7 @@ void V3Global::readFiles() {
         // Parse the std package
         parser.parseFile(new FileLine{FileLine::commandLineFilename()},
                          V3Options::getStdPackagePath(), false,
-                         "Cannot find std.sv containing built-in std:: definitions: ");
+                         "Cannot find verilated_std.sv containing built-in std:: definitions:");
     }
 
     // Read libraries
diff --git a/src/V3Options.cpp b/src/V3Options.cpp
index ca7ee2f3f..688ad5bad 100644
--- a/src/V3Options.cpp
+++ b/src/V3Options.cpp
@@ -706,7 +706,9 @@ string V3Options::getenvVERILATOR_ROOT() {
     return var;
 }
 
-string V3Options::getStdPackagePath() { return getenvVERILATOR_ROOT() + "/include/std.sv"; }
+string V3Options::getStdPackagePath() {
+    return getenvVERILATOR_ROOT() + "/include/verilated_std.sv";
+}
 
 string V3Options::getSupported(const string& var) {
     // If update below, also update V3Options::showVersion()