diff --git a/make/defs.mk b/make/defs.mk
index e1a895d3..c187e5ba 100644
--- a/make/defs.mk
+++ b/make/defs.mk
@@ -225,13 +225,15 @@ ifdef REENTRANT
 	ifneq ($(QT_VERSION),4)
 	LPPFLAGS      += $(QT_LDFLAGS) -lqt-mt
 	else
-	LPPFLAGS      += $(QT_LDFLAGS) -lQtSql -lQtNetwork -lQtOpenGL -lQtDesigner_debug -lQtGui_debug -lQtCore_debug
+	# LPPFLAGS      += $(QT_LDFLAGS) -lQtSql -lQtNetwork -lQtOpenGL -lQtDesigner_debug -lQtGui_debug -lQtCore_debug
+	LPPFLAGS      += $(QT_LDFLAGS) -lQtSql -lQtNetwork -lQtOpenGL -lQtDesigner -lQtGui -lQtCore
 	endif
 else
 	ifneq ($(QT_VERSION),4)
 	LPPFLAGS      += $(QT_LDFLAGS) -lqt
 	else
-	LPPFLAGS      += $(QT_LDFLAGS) -lQtSql -lQtNetwork -lQtOpenGL -lQtDesigner_debug -lQtGui_debug -lQtCore_debug
+	# LPPFLAGS      += $(QT_LDFLAGS) -lQtSql -lQtNetwork -lQtOpenGL -lQtDesigner_debug -lQtGui_debug -lQtCore_debug
+	LPPFLAGS      += $(QT_LDFLAGS) -lQtSql -lQtNetwork -lQtOpenGL -lQtDesigner -lQtGui -lQtCore
 	endif
 endif
 
@@ -382,6 +384,11 @@ ifeq ($(USE_TRACING),true)
 	PROJECT_CPPFLAGS    += -D_DO_TRACE_
 endif
 
+ifeq ($(USE_ASSERTIONS),false)
+	PROJECT_CFLAGS      += -DNDEBUG
+	PROJECT_CPPFLAGS    += -DNDEBUG
+endif
+
 ifeq ($(COMPILE_DEBUG_CODE),true)
 	PROJECT_CFLAGS      += -D_DEBUG_
 	PROJECT_CPPFLAGS    += -D_DEBUG_
@@ -397,10 +404,11 @@ ifeq ($(USE_COMPILER_DEBUG_OPTS),true)
 	PROJECT_CFLAGS      += -Wall -g3
 	PROJECT_CPPFLAGS    += -Wall -g3
 	PROJECT_LDFLAGS     += -Wall -g3
-else
-	ifeq ($(USE_COMPILER_OPTIMIZATION_OPTS),true)
-		PROJECT_CFLAGS   += -funroll-loops -O2
-	endif
+endif
+
+ifeq ($(USE_COMPILER_OPTIMIZATION_OPTS),true)
+	PROJECT_CFLAGS      += -funroll-loops -O2
+	PROJECT_CPPFLAGS    += -funroll-loops -O2
 endif
 
 #export PROJECT PROJECT_CFLAGS PROJECT_CPPFLAGS PROJECT_LDFLAGS USE_TIMER