diff --git a/lib/puppet/indirector/file_content.rb b/lib/puppet/indirector/file_content.rb
index 5261ddc05..5528b6263 100644
--- a/lib/puppet/indirector/file_content.rb
+++ b/lib/puppet/indirector/file_content.rb
@@ -1,5 +1,5 @@
-require 'puppet/file_serving/content'
-
 # A stub class, so our constants work.
 class Puppet::Indirector::FileContent # :nodoc:
 end
+
+require 'puppet/file_serving/content'
diff --git a/lib/puppet/indirector/file_metadata.rb b/lib/puppet/indirector/file_metadata.rb
index 1e2cd84eb..2a90955f6 100644
--- a/lib/puppet/indirector/file_metadata.rb
+++ b/lib/puppet/indirector/file_metadata.rb
@@ -1,3 +1,5 @@
 # A stub class, so our constants work.
 class Puppet::Indirector::FileMetadata # :nodoc:
 end
+
+require 'puppet/file_serving/metadata'