diff --git a/config/CONFIG_BASE b/config/CONFIG_BASE
index 800cdf4b4..54acc4429 100644
--- a/config/CONFIG_BASE
+++ b/config/CONFIG_BASE
@@ -35,8 +35,8 @@ DIRS += iocCore
 #
 # if CPLUSPLUS isnt empty then include C++ src codes
 #
-#DIRS += $(patsubst %,gdd,$(strip $(CPLUSPLUS)))
-#DIRS += $(patsubst %,cas,$(strip $(CPLUSPLUS)))
+DIRS += $(patsubst %,gdd,$(strip $(CPLUSPLUS)))
+DIRS += $(patsubst %,cas,$(strip $(CPLUSPLUS)))
 
 EPICS_BASE = $(TOP)