diff --git a/epan/CMakeLists.txt b/epan/CMakeLists.txt
index 9a8f38145f..029d26d71d 100644
--- a/epan/CMakeLists.txt
+++ b/epan/CMakeLists.txt
@@ -263,18 +263,27 @@ set(LIBWIRESHARK_CLEAN_FILES
 	${LIBWIRESHARK_FILES}
 )
 
-add_lex_files(LEX_FILES GENERATED_FILES
+add_lex_files(LEX_FILES CLEAN_GENERATED_FILES
 	diam_dict.l
 	dtd_parse.l
 	dtd_preparse.l
-	radius_dict.l
 	uat_load.l
 )
+#
+# There's still a warning when we clean up generated value_strings,
+# because the string pointer is a const pointer, but it's allocated
+# and we free it
+#
+add_lex_files(LEX_FILES GENERATED_FILES
+	radius_dict.l
+)
 
-add_lemon_files(LEMON_FILES GENERATED_FILES
+add_lemon_files(LEMON_FILES CLEAN_GENERATED_FILES
 	dtd_grammar.lemon
 )
 
+set(GENERATED_FILES ${GENERATED_FILES} ${CLEAN_GENERATED_FILES})
+
 set(epan_LIBS
 	wiretap
 	wsutil
@@ -298,6 +307,7 @@ set(epan_LIBS
 
 set(CLEAN_FILES
 	${LIBWIRESHARK_CLEAN_FILES}
+	${CLEAN_GENERATED_FILES}
 )
 
 set_source_files_properties(
diff --git a/epan/dfilter/CMakeLists.txt b/epan/dfilter/CMakeLists.txt
index 9d6b30b6f9..8ce5dc887f 100644
--- a/epan/dfilter/CMakeLists.txt
+++ b/epan/dfilter/CMakeLists.txt
@@ -31,7 +31,7 @@ set(DFILTER_PUBLIC_HEADERS
 	drange.h
 )
 
-set(DFILTER_FILES
+set(DFILTER_NONGENERATED_FILES
 	dfilter.c
 	dfilter-macro.c
 	dfunctions.c
@@ -48,26 +48,28 @@ set(DFILTER_FILES
 	sttype-test.c
 	syntax-tree.c
 )
-source_group(dfilter FILES ${DFILTER_FILES})
+source_group(dfilter FILES ${DFILTER_NONGENERATED_FILES})
 
+set(DFILTER_FILES ${DFILTER_NONGENERATED_FILES})
+
+add_lex_files(LEX_FILES DFILTER_FILES
+	scanner.l
+)
+
+add_lemon_files(LEMON_FILES DFILTER_FILES
+	grammar.lemon
+)
+
+#
+# All files are warning-clean.  (Let's keep it that way.)
+#
 set_source_files_properties(
 	${DFILTER_FILES}
 	PROPERTIES
 	COMPILE_FLAGS "${WERROR_COMMON_FLAGS}"
 )
 
-add_lex_files(LEX_FILES GENERATED_FILES
-	scanner.l
-)
-
-add_lemon_files(LEMON_FILES GENERATED_FILES
-	grammar.lemon
-)
-
-add_library(dfilter OBJECT
-	${DFILTER_FILES}
-	${GENERATED_FILES}
-)
+add_library(dfilter OBJECT ${DFILTER_FILES})
 
 set_target_properties(dfilter PROPERTIES
 	FOLDER "Libs/epan/dfilter"
@@ -86,7 +88,7 @@ CHECKAPI(
 	SWITCHES
 	  -g termoutput -build
 	SOURCES
-	  ${DFILTER_FILES}
+	  ${DFILTER_NONGENERATED_FILES}
 # LEX files commented out due to use of malloc, free etc.
 #	  ${LEX_FILES}
 	  ${LEMON_FILES}
diff --git a/wiretap/CMakeLists.txt b/wiretap/CMakeLists.txt
index 79ab0901d0..a39d509046 100644
--- a/wiretap/CMakeLists.txt
+++ b/wiretap/CMakeLists.txt
@@ -30,7 +30,7 @@ set(WIRETAP_PUBLIC_HEADERS
 	wtap_opttypes.h
 )
 
-set(WIRETAP_FILES
+set(WIRETAP_NONGENERATED_FILES
 	5views.c
 	aethra.c
 	ascendtext.c
@@ -93,21 +93,26 @@ set(WIRETAP_FILES
 	${CMAKE_SOURCE_DIR}/version_info.c
 )
 
-set_source_files_properties(
-	${WIRETAP_FILES}
-	PROPERTIES
-	COMPILE_FLAGS "${WERROR_COMMON_FLAGS}"
-)
+set(WIRETAP_FILES ${WIRETAP_NONGENERATED_FILES})
 
-add_lex_files(LEX_FILES GENERATED_FILES
+add_lex_files(LEX_FILES WIRETAP_FILES
 	ascend_scanner.l
 	k12text.l
 )
 
-add_yacc_files(YACC_FILES GENERATED_FILES
+add_yacc_files(YACC_FILES WIRETAP_FILES
 	ascend.y
 )
 
+#
+# All files are warning-clean.  (Let's keep it that way.)
+#
+set_source_files_properties(
+	${WIRETAP_FILES}
+	PROPERTIES
+	COMPILE_FLAGS "${WERROR_COMMON_FLAGS}"
+)
+
 set(wiretap_LIBS
 	${GLIB2_LIBRARIES}
 	${GMODULE2_LIBRARIES}
@@ -117,7 +122,6 @@ set(wiretap_LIBS
 
 add_library(wiretap
 	${WIRETAP_FILES}
-	${GENERATED_FILES}
 	${CMAKE_BINARY_DIR}/image/wiretap.rc
 )
 
@@ -173,7 +177,7 @@ CHECKAPI(
 ##	  -g abort -g termoutput
 	  -g termoutput -build
 	SOURCES
-	  ${WIRETAP_FILES}
+	  ${WIRETAP_NONGENERATED_FILES}
 # LEX files commented out due to use of malloc, free etc.
 #	  ${LEX_FILES}
 	  ${YACC_FILES}