diff --git a/src/incmake/component_FV3.mk b/src/incmake/component_FV3.mk
index 12f97f60..b9bbd1ae 100644
--- a/src/incmake/component_FV3.mk
+++ b/src/incmake/component_FV3.mk
@@ -10,16 +10,10 @@ FV3_BINDIR?=$(ROOTDIR)/FV3/FV3_INSTALL
 $(call require_dir,$(FV3_SRCDIR),FV3 source directory)
 
 # Make sure we're setting CCPP=Y if CCPP is enabled:
-ifneq (,$(findstring CCPP,$(COMPONENTS)))
-  ifeq (,$(findstring CCPP=Y,$(FV3_MAKEOPT)))
-    $(warning Adding CCPP=Y to FV3 make options because CCPP is listed as a component.)
-    override FV3_MAKEOPT += CCPP=Y
-  endif
   ifeq (,$(findstring PATH_CCPP=,$(FV3_MAKEOPT)))
-    $(warning Adding PATH_CCPP to FV3 make options because CCPP is listed as a component.)
+    $(warning Adding PATH_CCPP to FV3 make options.)
     override FV3_MAKEOPT += PATH_CCPP="$(CCPP_BINDIR)"
   endif
-endif
 
 FV3_FULL_OPTS=\
   COMP=FV3 \
diff --git a/src/incmake/dependencies.mk b/src/incmake/dependencies.mk
index 762ab8b4..34afa87b 100644
--- a/src/incmake/dependencies.mk
+++ b/src/incmake/dependencies.mk
@@ -19,10 +19,7 @@ FMS:
 	$(call prepend_component,$@)
 
 FV3_DEPS=FMS
-
-ifneq (,$(findstring CCPP=Y,$(COMPONENTS)))
-  FV3_DEPS += CCPP
-endif
+FV3_DEPS += CCPP
 
 CCPP:
 	$(call prepend_component,$@)