diff --git a/AMBuildScript b/AMBuildScript
index b44f676383..2196f1f8c1 100644
--- a/AMBuildScript
+++ b/AMBuildScript
@@ -773,6 +773,8 @@ if SM.use_auto_versioning():
   )
 
 class SPRoot(object):
+  def __init__(self):
+    self.generated_headers = SM.generated_headers
   # SourcePawn's build scripts are always one-offs, and attach the current target
   # to the builder, so we have to provide a shim to our StaticLibrary() method.
   def StaticLibrary(self, builder, name):
diff --git a/plugins/include/float.inc b/plugins/include/float.inc
index 9650489d7e..4a769767e7 100644
--- a/plugins/include/float.inc
+++ b/plugins/include/float.inc
@@ -275,7 +275,6 @@ stock int RoundFloat(float value)
  * User defined operators.
  */
 #if !defined __sourcepawn2__
-#pragma rational Float
 
 // Internal aliases for backwards compatibility.
 native float __FLOAT_MUL__(float a, float b) = FloatMul;
diff --git a/sourcepawn b/sourcepawn
index 9cf9f31d45..4328449dac 160000
--- a/sourcepawn
+++ b/sourcepawn
@@ -1 +1 @@
-Subproject commit 9cf9f31d4560fe7e76c6be75a2245088d03a3937
+Subproject commit 4328449dacde80ac017b80130d3fc651f547d0c4