diff --git a/include/glow/Graph/FXIRUtils.h b/include/glow/Graph/FXIRUtils.h
index 17ab011f57..ecf955a648 100644
--- a/include/glow/Graph/FXIRUtils.h
+++ b/include/glow/Graph/FXIRUtils.h
@@ -24,7 +24,7 @@
 #include <cstdint>
 #include <folly/Conv.h>
 #include <folly/String.h>
-#include <folly/dynamic.h>
+#include <folly/json/dynamic.h>
 #include <type_traits>
 
 namespace glow {
diff --git a/include/glow/Graph/FXIRWrapper.h b/include/glow/Graph/FXIRWrapper.h
index 6ec5869e45..dd23678908 100644
--- a/include/glow/Graph/FXIRWrapper.h
+++ b/include/glow/Graph/FXIRWrapper.h
@@ -20,7 +20,7 @@
 #include "glow/Graph/Graph.h"
 #include "llvm/ADT/MapVector.h"
 
-#include <folly/dynamic.h>
+#include <folly/json/dynamic.h>
 
 namespace glow {
 
diff --git a/lib/Backends/NNPI/NNPI.h b/lib/Backends/NNPI/NNPI.h
index 6db778dee5..38ac78683e 100644
--- a/lib/Backends/NNPI/NNPI.h
+++ b/lib/Backends/NNPI/NNPI.h
@@ -19,7 +19,7 @@
 #include "NNPIAdapterContainer.h"
 #include "NNPIOptions.h"
 #include "glow/Backend/Backend.h"
-#include <folly/dynamic.h>
+#include <folly/json/dynamic.h>
 #include <vector>
 
 namespace glow {
diff --git a/lib/Backends/NNPI/NNPICompiledFunction.h b/lib/Backends/NNPI/NNPICompiledFunction.h
index 49e0d3d663..333deb85bd 100644
--- a/lib/Backends/NNPI/NNPICompiledFunction.h
+++ b/lib/Backends/NNPI/NNPICompiledFunction.h
@@ -24,7 +24,7 @@
 #include "glow/ExecutionContext/ExecutionContext.h"
 #include "nnpi_inference_types.h"
 #include "nnpi_transformer.h"
-#include <folly/dynamic.h>
+#include <folly/json/dynamic.h>
 #include <map>
 #include <memory>
 #include <mutex>
diff --git a/lib/Graph/FXIRUtils.cpp b/lib/Graph/FXIRUtils.cpp
index 8313aabfec..775b6da281 100644
--- a/lib/Graph/FXIRUtils.cpp
+++ b/lib/Graph/FXIRUtils.cpp
@@ -19,7 +19,7 @@
 #include "glow/Graph/FXIRWrapper.h"
 #include "llvm/Support/Casting.h"
 
-#include <folly/DynamicConverter.h>
+#include <folly/json/DynamicConverter.h>
 
 using namespace glow;
 
diff --git a/lib/Runtime/Provisioner/Provisioner.cpp b/lib/Runtime/Provisioner/Provisioner.cpp
index c91343ff64..f057f8de29 100644
--- a/lib/Runtime/Provisioner/Provisioner.cpp
+++ b/lib/Runtime/Provisioner/Provisioner.cpp
@@ -26,7 +26,7 @@
 #include "llvm/Support/FileSystem.h"
 #include "llvm/Support/FormatVariadic.h"
 
-#include <folly/dynamic.h>
+#include <folly/json/dynamic.h>
 #include <future>
 #include <map>
 #include <mutex>
diff --git a/torch_glow/src/GlowCompileSpec.cpp b/torch_glow/src/GlowCompileSpec.cpp
index c0345c4030..f82baea25a 100644
--- a/torch_glow/src/GlowCompileSpec.cpp
+++ b/torch_glow/src/GlowCompileSpec.cpp
@@ -16,7 +16,7 @@
 
 #include "GlowCompileSpec.h"
 #include "PyTorchCommon.h"
-#include "folly/json.h"
+#include "folly/json/json.h"
 #include <ATen/core/ivalue.h>
 #include <torch/custom_class.h>
 
diff --git a/torch_glow/src/GlowCompileSpec.h b/torch_glow/src/GlowCompileSpec.h
index 17bfcbff7a..4088b416e6 100644
--- a/torch_glow/src/GlowCompileSpec.h
+++ b/torch_glow/src/GlowCompileSpec.h
@@ -20,8 +20,8 @@
 #include "PyTorchCommon.h"
 #include <ATen/core/ivalue.h>
 
-#include "folly/dynamic.h"
-#include "folly/json.h"
+#include "folly/json/dynamic.h"
+#include "folly/json/json.h"
 
 namespace glow {