fix F14 fallback build for modules

Summary:
F14MapFallback.h and F14SetFallback.h can now be compiled
standalone when F14 intrinsics are disabled.

Reviewed By: andrewjcg, yfeldblum

Differential Revision: D22785153

fbshipit-source-id: 96a1d3b2773a83dee8484fa40f35bbc791aec57c

folly/container/detail/F14MapFallback.h

@@ -16,7 +16,15 @@
 
 #pragma once
 
-#include <folly/container/detail/F14IntrinsicsAvailability.h>
+#include <algorithm>
+#include <type_traits>
+#include <unordered_map>
+
+#include <folly/Optional.h>
+#include <folly/lang/Assume.h>
+
+#include <folly/container/detail/F14Table.h>
+#include <folly/container/detail/Util.h>
 
 /**
  * This file is intended to be included only by F14Map.h. It contains fallback
@@ -26,13 +34,6 @@
 
 #if !FOLLY_F14_VECTOR_INTRINSICS_AVAILABLE
 
-#include <unordered_map>
-
-#include <algorithm>
-
-#include <folly/Optional.h>
-#include <folly/lang/Assume.h>
-
 namespace folly {
 
 namespace f14 {

folly/container/detail/F14SetFallback.h

@@ -16,7 +16,12 @@
 
 #pragma once
 
-#include <folly/container/detail/F14IntrinsicsAvailability.h>
+#include <algorithm>
+#include <type_traits>
+#include <unordered_set>
+
+#include <folly/container/detail/F14Table.h>
+#include <folly/container/detail/Util.h>
 
 /**
  * This file is intended to be included only by F14Set.h. It contains fallback
@@ -26,9 +31,6 @@
 
 #if !FOLLY_F14_VECTOR_INTRINSICS_AVAILABLE
 
-#include <algorithm>
-#include <unordered_set>
-
 namespace folly {
 
 namespace f14 {