diff --git a/indra/plugins/base_basic/CMakeLists.txt b/indra/plugins/base_basic/CMakeLists.txt
index 404ef3fee..7c941af4f 100644
--- a/indra/plugins/base_basic/CMakeLists.txt
+++ b/indra/plugins/base_basic/CMakeLists.txt
@@ -33,6 +33,11 @@ set(basic_plugin_base_HEADER_FILES
     basic_plugin_base.h
 )
 
+set_source_files_properties(${basic_plugin_base_HEADER_FILES}
+                            PROPERTIES HEADER_FILE_ONLY TRUE)
+
+list(APPEND basic_plugin_base_SOURCE_FILES ${basic_plugin_base_HEADER_FILES})
+
 add_library(basic_plugin_base
     ${basic_plugin_base_SOURCE_FILES}
 )
diff --git a/indra/plugins/base_media/CMakeLists.txt b/indra/plugins/base_media/CMakeLists.txt
index acd8d201c..504b6c932 100644
--- a/indra/plugins/base_media/CMakeLists.txt
+++ b/indra/plugins/base_media/CMakeLists.txt
@@ -47,6 +47,11 @@ set(media_plugin_base_HEADER_FILES
     media_plugin_base.h
 )
 
+set_source_files_properties(${media_plugin_base_HEADER_FILES}
+                            PROPERTIES HEADER_FILE_ONLY TRUE)
+
+list(APPEND media_plugin_base_SOURCE_FILES ${media_plugin_base_HEADER_FILES})
+
 add_library(media_plugin_base
     ${media_plugin_base_SOURCE_FILES}
 )
@@ -54,8 +59,3 @@ add_library(media_plugin_base
 target_link_libraries(media_plugin_base
 	${BASIC_PLUGIN_BASE_LIBRARIES}
 )
-
-add_dependencies(media_plugin_base
-	${BASIC_PLUGIN_BASE_LIBRARIES}
-)
-