diff --git a/src/file_analysis/Manager.cc b/src/file_analysis/Manager.cc
index b7f4335717..5975133356 100644
--- a/src/file_analysis/Manager.cc
+++ b/src/file_analysis/Manager.cc
@@ -18,7 +18,8 @@ TableVal* Manager::disabled = 0;
 string Manager::salt;
 
 Manager::Manager()
-	: ComponentManager<file_analysis::Tag, file_analysis::Component>("Files")
+	: plugin::ComponentManager<file_analysis::Tag,
+	                           file_analysis::Component>("Files")
 	{
 	}
 
diff --git a/src/file_analysis/analyzer/data_event/CMakeLists.txt b/src/file_analysis/analyzer/data_event/CMakeLists.txt
index 81551feda2..49e23d49a0 100644
--- a/src/file_analysis/analyzer/data_event/CMakeLists.txt
+++ b/src/file_analysis/analyzer/data_event/CMakeLists.txt
@@ -4,5 +4,5 @@ include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR}
                            ${CMAKE_CURRENT_BINARY_DIR})
 
 bro_plugin_begin(Bro FileDataEvent)
-bro_plugin_cc(DataEvent.cc Plugin.cc)
+bro_plugin_cc(DataEvent.cc Plugin.cc ../../Analyzer.cc)
 bro_plugin_end()
diff --git a/src/file_analysis/analyzer/extract/CMakeLists.txt b/src/file_analysis/analyzer/extract/CMakeLists.txt
index df3fa2646d..e413196db2 100644
--- a/src/file_analysis/analyzer/extract/CMakeLists.txt
+++ b/src/file_analysis/analyzer/extract/CMakeLists.txt
@@ -4,5 +4,5 @@ include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR}
                            ${CMAKE_CURRENT_BINARY_DIR})
 
 bro_plugin_begin(Bro FileExtract)
-bro_plugin_cc(Extract.cc Plugin.cc)
+bro_plugin_cc(Extract.cc Plugin.cc ../../Analyzer.cc)
 bro_plugin_end()
diff --git a/src/file_analysis/analyzer/hash/CMakeLists.txt b/src/file_analysis/analyzer/hash/CMakeLists.txt
index 5734740198..0e3143ee05 100644
--- a/src/file_analysis/analyzer/hash/CMakeLists.txt
+++ b/src/file_analysis/analyzer/hash/CMakeLists.txt
@@ -4,6 +4,6 @@ include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR}
                            ${CMAKE_CURRENT_BINARY_DIR})
 
 bro_plugin_begin(Bro FileHash)
-bro_plugin_cc(Hash.cc Plugin.cc)
+bro_plugin_cc(Hash.cc Plugin.cc ../../Analyzer.cc)
 bro_plugin_bif(events.bif)
 bro_plugin_end()