diff --git a/Makefile b/Makefile
index e63399c..a94cf23 100644
--- a/Makefile
+++ b/Makefile
@@ -26,6 +26,7 @@ TEMPLATES += db/sinqMotor.db
 # This file registers the motor-specific functions in the IOC shell.
 DBDS += src/sinqMotor.dbd
 
-USR_CFLAGS += -Wall -Wextra -Weffc++ -Wunused-result # -Werror
+USR_CFLAGS += -Wall -Wextra -Wunused-result # -Werror
+USR_CXXFLAGS += -Wall -Wextra -Weffc++ -Wunused-result
 
 # MISCS would be the place to keep the stream device template files