Revert changes from main commits that were merged into blender-v4.1-release

The last good commit was f57e4c5b98.

After this one more fix was committed, this one is preserved as well:
67bd678887.

source/blender/python/intern/bpy_driver.cc

@@ -20,11 +20,12 @@
 
 #include "BKE_animsys.h"
 #include "BKE_fcurve_driver.h"
-#include "BKE_global.hh"
+#include "BKE_global.h"
 #include "BKE_idtype.hh"
 
 #include "RNA_access.hh"
 #include "RNA_prototypes.h"
+#include "RNA_types.hh"
 
 #include "bpy_rna_driver.h" /* For #pyrna_driver_get_variable_value. */
 
@@ -493,7 +494,7 @@ float BPY_driver_exec(PathResolvedRNA *anim_rna,
    * now release the GIL on python operator execution instead, using
    * #PyEval_SaveThread() / #PyEval_RestoreThread() so we don't lock up blender.
    *
-   * For copy-on-evaluation we always cache expressions and write errors in the
+   * For copy-on-write we always cache expressions and write errors in the
    * original driver, otherwise these would get freed while editing.
    * Due to the GIL this is thread-safe. */