diff --git a/Makefile.in b/Makefile.in
index abf9377..509af4e 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -13,8 +13,8 @@ SYSROOT 		= @sysroot@
 CROSS_COMPILE 		= @cross_compile@
 SHELL 			= @shell@
 
-CFLAGS_DEBUG 		= @cflags_debug@
 CFLAGS_COMMON 		= @cflags_common@
+CFLAGS_DEBUG 		= @cflags_debug@
 CFLAGS_CMDLINE 		= @cflags_cmdline@
 CFLAGS_CONFIG 		= @cflags_config@
 CFLAGS_SYSROOT 		= @cflags_sysroot@
@@ -22,8 +22,8 @@ CFLAGS_OS		= @cflags_os@
 CFLAGS_SITE		= @cflags_site@
 CFLAGS_PATH 		= @cflags_path@
 
-LDFLAGS_DEBUG 		= @ldflags_debug@
 LDFLAGS_COMMON 		= @ldflags_common@
+LDFLAGS_DEBUG 		= @ldflags_debug@
 LDFLAGS_CMDLINE 	= @ldflags_cmdline@
 LDFLAGS_CONFIG 		= @ldflags_config@
 LDFLAGS_SYSROOT 	= @ldflags_sysroot@
@@ -261,8 +261,8 @@ clean:		clean-implib
 		@echo
 
 .display-flags:
-		@echo CFLAGS_DEBUG:'           '$(CFLAGS_DEBUG)
 		@echo CFLAGS_COMMON:'          '$(CFLAGS_COMMON)
+		@echo CFLAGS_DEBUG:'           '$(CFLAGS_DEBUG)
 		@echo CFLAGS_VERSION:'         '$(CFLAGS_VERSION)
 		@echo CFLAGS_CMDLINE:'         '$(CFLAGS_CMDLINE)
 		@echo CFLAGS_CONFIG:'          '$(CFLAGS_CONFIG)
@@ -271,8 +271,8 @@ clean:		clean-implib
 		@echo CFLAGS_SITE:'            '$(CFLAGS_SITE)
 		@echo CFLAGS_PATH:'            '$(CFLAGS_PATH)
 		@echo
-		@echo LDFLAGS_DEBUG:'           '$(LDFLAGS_DEBUG)
 		@echo LDFLAGS_COMMON:'          '$(LDFLAGS_COMMON)
+		@echo LDFLAGS_DEBUG:'           '$(LDFLAGS_DEBUG)
 		@echo LDFLAGS_CMDLINE:'         '$(LDFLAGS_CMDLINE)
 		@echo LDFLAGS_CONFIG:'          '$(LDFLAGS_CONFIG)
 		@echo LDFLAGS_SYSROOT:'         '$(LDFLAGS_SYSROOT)
diff --git a/config.project b/config.project
index c3dd226..4c4df66 100644
--- a/config.project
+++ b/config.project
@@ -16,15 +16,19 @@ mb_default_shell=sh
 
 
 # switches
+mb_default_cflags_common="-std=c99 -D_XOPEN_SOURCE=700"
+mb_default_cflags_common="$mb_default_cflags_common -I\$(PROJECT_DIR)/src/internal"
+mb_default_cflags_common="$mb_default_cflags_common -I\$(PROJECT_DIR)/include"
+mb_default_cflags_common="$mb_default_cflags_common -Ibuild"
+
 mb_default_cflags_debug=
-mb_default_cflags_common="-std=c99 -D_XOPEN_SOURCE=700 -I\$(PROJECT_DIR)/src/internal -I\$(PROJECT_DIR)/include -Ibuild"
 mb_default_cflags_cmdline=
 mb_default_cflags_config=
 mb_default_cflags_sysroot=
 mb_default_cflags_path=
 
-mb_default_ldflags_debug=
 mb_default_ldflags_common="-Llib"
+mb_default_ldflags_debug=
 mb_default_ldflags_cmdline=
 mb_default_ldflags_config=
 mb_default_ldflags_sysroot=