diff --git a/aclocal.m4 b/aclocal.m4
index 5cc06cb9..6e51d467 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -173,7 +173,7 @@ AC_DEFUN([AC_PACKAGE_GLOBALS],
     debug_build="$DEBUG"
     AC_SUBST(debug_build)
 
-    OPTIMIZER=${OPTIMIZER:-'-g'}	dnl  -O2
+    OPTIMIZER=${OPTIMIZER:-'-g -O2'}
     opt_build="$OPTIMIZER"
     AC_SUBST(opt_build)
 
diff --git a/include/builddefs.in b/include/builddefs.in
index 3d7c6255..353ab239 100644
--- a/include/builddefs.in
+++ b/include/builddefs.in
@@ -57,15 +57,13 @@ endif
 ifeq ($(PKG_PLATFORM),darwin)
 PCFLAGS = -traditional-cpp
 endif
-
 ifeq ($(PKG_PLATFORM),irix)
-CFLAGS += $(OPTIMIZER) $(DEBUG) -nostdinc -I$(ROOT)/usr/include \
-	-I$(TOPDIR)/include -DVERSION=\"$(PKG_VERSION)\" -D_REENTRANT
-else
-CFLAGS += -O1 $(OPTIMIZER) $(DEBUG) -funsigned-char -fno-strict-aliasing -Wall \
-	-I$(TOPDIR)/include -DVERSION=\"$(PKG_VERSION)\" -D_REENTRANT
+PCFLAGS = -nostdinc -I$(ROOT)/usr/include
 endif
 
+GCFLAGS = $(OPTIMIZER) $(DEBUG) -funsigned-char -fno-strict-aliasing -Wall \
+	-I$(TOPDIR)/include -DVERSION=\"$(PKG_VERSION)\"
+
 # Global, Platform, Local CFLAGS
 CFLAGS += $(GCFLAGS) $(PCFLAGS) $(LCFLAGS)
 
diff --git a/m4/package_globals.m4 b/m4/package_globals.m4
index c28e1a17..665afc83 100644
--- a/m4/package_globals.m4
+++ b/m4/package_globals.m4
@@ -19,7 +19,7 @@ AC_DEFUN([AC_PACKAGE_GLOBALS],
     debug_build="$DEBUG"
     AC_SUBST(debug_build)
 
-    OPTIMIZER=${OPTIMIZER:-'-g'}	dnl  -O2
+    OPTIMIZER=${OPTIMIZER:-'-g -O2'}
     opt_build="$OPTIMIZER"
     AC_SUBST(opt_build)