diff --git a/Make.common b/Make.common
index 95a3a97..3f0b919 100644
--- a/Make.common
+++ b/Make.common
@@ -60,7 +60,7 @@ endif
 #
 
 # ...for both GNU-EFI and TianoCore....
-OPTIMFLAGS      = -Os -fno-strict-aliasing -fno-tree-loop-distribute-patterns
+OPTIMFLAGS      = -Os -fno-strict-aliasing
 CFLAGS          = $(OPTIMFLAGS) -fno-stack-protector -fshort-wchar -Wall
 
 # ...for GNU-EFI....
diff --git a/filesystems/crc32c.c b/filesystems/crc32c.c
index ec10d25..5a3f350 100644
--- a/filesystems/crc32c.c
+++ b/filesystems/crc32c.c
@@ -20,13 +20,11 @@
  *  along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <stdint.h> 
+
 static uint32_t crc32c_table [256];
 
-static void
-init_crc32c_table (void)
-{
-  auto uint32_t reflect (uint32_t ref, int len);
-  uint32_t reflect (uint32_t ref, int len)
+static uint32_t reflect (uint32_t ref, int len)
     {
       uint32_t result = 0;
       int i;
@@ -41,8 +39,11 @@ init_crc32c_table (void)
       return result;
     }
 
-  static int crc32c_table_inited;
-  if(crc32c_table_inited)
+static void
+init_crc32c_table (void)
+{
+    static int crc32c_table_inited;
+  	if(crc32c_table_inited)
 	  return;
   crc32c_table_inited = 1;