--- a/Makefile
+++ b/Makefile
@@ -83,7 +83,7 @@ STRIP ?= strip
 LD = $(CC)
 WARNINGS ?= -Wall -Wsign-compare
 INCLUDES = -I$(INCLUDE_DIR)
-BASE_FLAGS = -fPIC -g
+BASE_FLAGS = -fPIC
 FULL_CFLAGS = $(BASE_FLAGS) $(CFLAGS) $(DEFINES) $(WARNINGS) $(INCLUDES) \
   -DGLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_32 \
   -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_MAX_ALLOWED \
@@ -97,7 +97,7 @@ KEEP_SYMBOLS ?= 0
 DEBUG_LDFLAGS = $(FULL_LDFLAGS)
 RELEASE_LDFLAGS = $(FULL_LDFLAGS)
 DEBUG_CFLAGS = $(FULL_CFLAGS) -DDEBUG
-RELEASE_CFLAGS = $(FULL_CFLAGS) -O2
+RELEASE_CFLAGS = $(FULL_CFLAGS)
 COVERAGE_CFLAGS = $(FULL_CFLAGS) -O0 --coverage
 
 #
--- a/test/common/Makefile
+++ b/test/common/Makefile
@@ -48,7 +48,7 @@ CC ?= $(CROSS_COMPILE)gcc
 LD = $(CC)
 WARNINGS = -Wall
 INCLUDES = -I$(LIB_DIR)/include -I$(LIB_DIR)/src -I$(COMMON_DIR)
-BASE_FLAGS = -fPIC -g
+BASE_FLAGS = -fPIC
 BASE_LDFLAGS = $(BASE_FLAGS) $(LDFLAGS)
 BASE_CFLAGS = $(BASE_FLAGS) $(CFLAGS)
 FULL_CFLAGS = $(BASE_CFLAGS) $(DEFINES) $(WARNINGS) $(INCLUDES) -MMD -MP \
@@ -64,7 +64,7 @@ RELEASE_LDFLAGS = $(FULL_LDFLAGS)
 COVERAGE_LDFLAGS = $(FULL_LDFLAGS) --coverage
 
 DEBUG_CFLAGS = $(FULL_CFLAGS) -DDEBUG
-RELEASE_CFLAGS = $(FULL_CFLAGS) -O2
+RELEASE_CFLAGS = $(FULL_CFLAGS)
 COVERAGE_CFLAGS = $(FULL_CFLAGS) --coverage
 
 #