diff --git a/make/defs-cpp.mk b/make/defs-cpp.mk
index 038d4625..8c5c7c32 100644
--- a/make/defs-cpp.mk
+++ b/make/defs-cpp.mk
@@ -214,6 +214,18 @@ ifeq ($(COMPILER_SUITE),gcc)
     endif
   endif
 
+  ifeq ($(GCC_MAJOR),2)
+    FINAL_LPPFLAGS          += -lm
+    FINAL_CPPFLAGS          += -I/usr/local/include
+  else ifeq ($(GCC_MAJOR),3)
+    ifeq ($(GCC_MINOR),3)
+      FINAL_LPPFLAGS        += -lgcc_s
+      # FINAL_LPPFLAGS      += -L/usr/local/gcc3.3/lib
+    endif
+  else
+    FINAL_CPPFLAGS          += -DGCC_HASCLASSVISIBILITY
+  endif
+
 else ifeq ($(COMPILER_SUITE),clang)
 
   # clang
@@ -462,10 +474,6 @@ ALL_CSRC                    += $(LOCAL_CSRC) $(PREREQ_CSRC)
 
 CORE                        += $(filter-out $(wildcard *.intern-state*),$(wildcard core core.* vgcore vgcore.*))
 
-ifeq ($(GCC_MAJOR),4)
-  FINAL_CPPFLAGS            += -DGCC_HASCLASSVISIBILITY
-endif
-
 ifeq ($(USE_QT),true)
   include $(MODDIR)/make/qtversion.mk
   include $(MODDIR)/make/qt-defs.mk
@@ -479,18 +487,6 @@ ifneq ($(TARGET_TRIPLET),arm-none-eabi)
   FINAL_LPPFLAGS            += -lstdc++
 endif
 
-ifeq ($(GCC_MAJOR),2)
-  FINAL_LPPFLAGS            += -lm
-  FINAL_CPPFLAGS            += -I/usr/local/include
-else
-  ifeq ($(GCC_MAJOR),3)
-    ifeq ($(GCC_MINOR),3)
-      FINAL_LPPFLAGS        += -lgcc_s
-      # FINAL_LPPFLAGS      += -L/usr/local/gcc3.3/lib
-    endif
-  endif
-endif
-
 ifeq ($(TARGET),mingw)
   FINAL_CPPFLAGS            += -DWIN32
   # see https://stackoverflow.com/questions/4492799