diff --git a/xplat/Flipper/CertificateUtils.cpp b/xplat/Flipper/CertificateUtils.cpp
index 6875da531..bc9bc8c97 100644
--- a/xplat/Flipper/CertificateUtils.cpp
+++ b/xplat/Flipper/CertificateUtils.cpp
@@ -1,9 +1,8 @@
-/*
- *  Copyright (c) 2004-present, Facebook, Inc.
- *
- *  This source code is licensed under the MIT license found in the LICENSE
- *  file in the root directory of this source tree.
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
+ * This source code is licensed under the MIT license found in the LICENSE
+ * file in the root directory of this source tree.
  */
 #include "CertificateUtils.h"
 
diff --git a/xplat/Flipper/CertificateUtils.h b/xplat/Flipper/CertificateUtils.h
index 428fbace8..b211ee574 100644
--- a/xplat/Flipper/CertificateUtils.h
+++ b/xplat/Flipper/CertificateUtils.h
@@ -1,9 +1,8 @@
-/*
- *  Copyright (c) 2004-present, Facebook, Inc.
- *
- *  This source code is licensed under the MIT license found in the LICENSE
- *  file in the root directory of this source tree.
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
+ * This source code is licensed under the MIT license found in the LICENSE
+ * file in the root directory of this source tree.
  */
 #ifndef CertificateUtils_hpp
 #define CertificateUtils_hpp
diff --git a/xplat/Flipper/FlipperConnection.h b/xplat/Flipper/FlipperConnection.h
index 7c9f36214..9dbb4b4dd 100644
--- a/xplat/Flipper/FlipperConnection.h
+++ b/xplat/Flipper/FlipperConnection.h
@@ -1,11 +1,9 @@
-/*
- *  Copyright (c) 2018-present, Facebook, Inc.
- *
- *  This source code is licensed under the MIT license found in the LICENSE
- *  file in the root directory of this source tree.
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
+ * This source code is licensed under the MIT license found in the LICENSE
+ * file in the root directory of this source tree.
  */
-
 #pragma once
 
 #include "FlipperResponder.h"
diff --git a/xplat/Flipper/FlipperPlugin.h b/xplat/Flipper/FlipperPlugin.h
index 3be789aa8..9cb4c1717 100644
--- a/xplat/Flipper/FlipperPlugin.h
+++ b/xplat/Flipper/FlipperPlugin.h
@@ -1,9 +1,8 @@
-/*
- *  Copyright (c) 2018-present, Facebook, Inc.
- *
- *  This source code is licensed under the MIT license found in the LICENSE
- *  file in the root directory of this source tree.
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
+ * This source code is licensed under the MIT license found in the LICENSE
+ * file in the root directory of this source tree.
  */
 #pragma once
 
diff --git a/xplat/Flipper/FlipperState.cpp b/xplat/Flipper/FlipperState.cpp
index 408e6d2ca..c12bebdeb 100644
--- a/xplat/Flipper/FlipperState.cpp
+++ b/xplat/Flipper/FlipperState.cpp
@@ -1,9 +1,8 @@
-/*
- *  Copyright (c) 2018-present, Facebook, Inc.
- *
- *  This source code is licensed under the MIT license found in the LICENSE
- *  file in the root directory of this source tree.
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
+ * This source code is licensed under the MIT license found in the LICENSE
+ * file in the root directory of this source tree.
  */
 #include "FlipperState.h"
 #include "FlipperStateUpdateListener.h"
diff --git a/xplat/Flipper/FlipperState.h b/xplat/Flipper/FlipperState.h
index 82c832758..5c225b598 100644
--- a/xplat/Flipper/FlipperState.h
+++ b/xplat/Flipper/FlipperState.h
@@ -1,11 +1,9 @@
-/*
- *  Copyright (c) 2018-present, Facebook, Inc.
- *
- *  This source code is licensed under the MIT license found in the LICENSE
- *  file in the root directory of this source tree.
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
+ * This source code is licensed under the MIT license found in the LICENSE
+ * file in the root directory of this source tree.
  */
-
 #pragma once
 
 #include <memory>
diff --git a/xplat/Flipper/FlipperStateUpdateListener.h b/xplat/Flipper/FlipperStateUpdateListener.h
index 59bd606d7..e279fbdd7 100644
--- a/xplat/Flipper/FlipperStateUpdateListener.h
+++ b/xplat/Flipper/FlipperStateUpdateListener.h
@@ -1,11 +1,9 @@
-/*
- *  Copyright (c) 2018-present, Facebook, Inc.
- *
- *  This source code is licensed under the MIT license found in the LICENSE
- *  file in the root directory of this source tree.
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
+ * This source code is licensed under the MIT license found in the LICENSE
+ * file in the root directory of this source tree.
  */
-
 #pragma once
 
 class FlipperStateUpdateListener {
diff --git a/xplat/Flipper/FlipperStep.h b/xplat/Flipper/FlipperStep.h
index 496b6b048..255456ce5 100644
--- a/xplat/Flipper/FlipperStep.h
+++ b/xplat/Flipper/FlipperStep.h
@@ -1,11 +1,9 @@
-/*
- *  Copyright (c) 2018-present, Facebook, Inc.
- *
- *  This source code is licensed under the MIT license found in the LICENSE
- *  file in the root directory of this source tree.
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
+ * This source code is licensed under the MIT license found in the LICENSE
+ * file in the root directory of this source tree.
  */
-
 #pragma once
 
 #include <string>
diff --git a/xplat/FlipperTestLib/FlipperPluginMock.h b/xplat/FlipperTestLib/FlipperPluginMock.h
index 02becf427..3629b9aec 100644
--- a/xplat/FlipperTestLib/FlipperPluginMock.h
+++ b/xplat/FlipperTestLib/FlipperPluginMock.h
@@ -1,9 +1,8 @@
-/*
- *  Copyright (c) Facebook, Inc.
- *
- *  This source code is licensed under the MIT license found in the LICENSE
- *  file in the root directory of this source tree.
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
+ * This source code is licensed under the MIT license found in the LICENSE
+ * file in the root directory of this source tree.
  */
 #pragma once