diff --git a/security/manager/ssl/SSLServerCertVerification.cpp b/security/manager/ssl/SSLServerCertVerification.cpp
index 43663aeda0cd..b6edd2e8e0d4 100644
--- a/security/manager/ssl/SSLServerCertVerification.cpp
+++ b/security/manager/ssl/SSLServerCertVerification.cpp
@@ -1376,7 +1376,8 @@ SECStatus AuthCertificate(CertVerifier& certVerifier,
   return rv == Success ? SECSuccess : SECFailure;
 }
 
-/*static*/ SECStatus SSLServerCertVerificationJob::Dispatch(
+/*static*/
+SECStatus SSLServerCertVerificationJob::Dispatch(
     const RefPtr<SharedCertVerifier>& certVerifier, const void* fdForLogging,
     nsNSSSocketInfo* infoObject, const UniqueCERTCertificate& serverCert,
     const UniqueCERTCertList& peerCertChain, const SECItem* stapledOCSPResponse,
diff --git a/security/manager/ssl/SharedSSLState.cpp b/security/manager/ssl/SharedSSLState.cpp
index 412d0577eafc..c1ad549370c0 100644
--- a/security/manager/ssl/SharedSSLState.cpp
+++ b/security/manager/ssl/SharedSSLState.cpp
@@ -158,14 +158,16 @@ bool SharedSSLState::SocketCreated() {
   return mSocketCreated;
 }
 
-/*static*/ void SharedSSLState::GlobalInit() {
+/*static*/
+void SharedSSLState::GlobalInit() {
   MOZ_ASSERT(NS_IsMainThread(), "Not on main thread");
   gPublicState = new SharedSSLState();
   gPrivateState = new SharedSSLState();
   gPrivateState->NotePrivateBrowsingStatus();
 }
 
-/*static*/ void SharedSSLState::GlobalCleanup() {
+/*static*/
+void SharedSSLState::GlobalCleanup() {
   MOZ_ASSERT(NS_IsMainThread(), "Not on main thread");
 
   if (gPrivateState) {
@@ -181,7 +183,8 @@ bool SharedSSLState::SocketCreated() {
   }
 }
 
-/*static*/ void SharedSSLState::NoteCertOverrideServiceInstantiated() {
+/*static*/
+void SharedSSLState::NoteCertOverrideServiceInstantiated() {
   sCertOverrideSvcExists = true;
 }
 
diff --git a/security/manager/ssl/TransportSecurityInfo.cpp b/security/manager/ssl/TransportSecurityInfo.cpp
index dad995ae3eac..4734774bb2ff 100644
--- a/security/manager/ssl/TransportSecurityInfo.cpp
+++ b/security/manager/ssl/TransportSecurityInfo.cpp
@@ -588,8 +588,8 @@ TransportSecurityInfo::GetClassIDNoAlloc(nsCID* aClassIDNoAlloc) {
 
 // RememberCertErrorsTable
 
-/*static*/ RememberCertErrorsTable* RememberCertErrorsTable::sInstance =
-    nullptr;
+/*static*/
+RememberCertErrorsTable* RememberCertErrorsTable::sInstance = nullptr;
 
 RememberCertErrorsTable::RememberCertErrorsTable()
     : mErrorHosts(), mMutex("RememberCertErrorsTable::mMutex") {}
diff --git a/security/manager/ssl/nsNSSCertificate.cpp b/security/manager/ssl/nsNSSCertificate.cpp
index 1e60516e6da9..fd7ee541cf06 100644
--- a/security/manager/ssl/nsNSSCertificate.cpp
+++ b/security/manager/ssl/nsNSSCertificate.cpp
@@ -80,7 +80,8 @@ class nsNSSCertListEnumerator : public nsSimpleEnumerator {
 
 NS_IMPL_ISUPPORTS(nsNSSCertificate, nsIX509Cert, nsISerializable, nsIClassInfo)
 
-/*static*/ nsNSSCertificate* nsNSSCertificate::Create(CERTCertificate* cert) {
+/*static*/
+nsNSSCertificate* nsNSSCertificate::Create(CERTCertificate* cert) {
   if (cert)
     return new nsNSSCertificate(cert);
   else
diff --git a/security/manager/ssl/nsNSSComponent.cpp b/security/manager/ssl/nsNSSComponent.cpp
index 0f0d08273e2f..a05bd2a81996 100644
--- a/security/manager/ssl/nsNSSComponent.cpp
+++ b/security/manager/ssl/nsNSSComponent.cpp
@@ -989,10 +989,11 @@ static const CipherPref sCipherPrefs[] = {
 // This function will convert from pref values like 1, 2, ...
 // to the internal values of SSL_LIBRARY_VERSION_TLS_1_0,
 // SSL_LIBRARY_VERSION_TLS_1_1, ...
-/*static*/ void nsNSSComponent::FillTLSVersionRange(SSLVersionRange& rangeOut,
-                                                    uint32_t minFromPrefs,
-                                                    uint32_t maxFromPrefs,
-                                                    SSLVersionRange defaults) {
+/*static*/
+void nsNSSComponent::FillTLSVersionRange(SSLVersionRange& rangeOut,
+                                         uint32_t minFromPrefs,
+                                         uint32_t maxFromPrefs,
+                                         SSLVersionRange defaults) {
   rangeOut = defaults;
   // determine what versions are supported
   SSLVersionRange supported;
@@ -1998,7 +1999,8 @@ nsNSSComponent::Observe(nsISupports* aSubject, const char* aTopic,
   return NS_OK;
 }
 
-/*static*/ nsresult nsNSSComponent::GetNewPrompter(nsIPrompt** result) {
+/*static*/
+nsresult nsNSSComponent::GetNewPrompter(nsIPrompt** result) {
   NS_ENSURE_ARG_POINTER(result);
   *result = nullptr;
 
diff --git a/security/sandbox/chromium-shim/sandbox/win/permissionsService.cpp b/security/sandbox/chromium-shim/sandbox/win/permissionsService.cpp
index 80ee82ed51bb..bdea6806123e 100644
--- a/security/sandbox/chromium-shim/sandbox/win/permissionsService.cpp
+++ b/security/sandbox/chromium-shim/sandbox/win/permissionsService.cpp
@@ -84,9 +84,8 @@ GetPlainFileName(const wchar_t* aNTFileName, std::wstring* aFolder=nullptr)
   return nameCopy;
 }
 
-/* static */ PermissionsService*
-PermissionsService::GetInstance()
-{
+/* static */
+PermissionsService* PermissionsService::GetInstance() {
   static PermissionsService sPermissionsService;
   return &sPermissionsService;
 }
diff --git a/security/sandbox/linux/broker/SandboxBrokerCommon.cpp b/security/sandbox/linux/broker/SandboxBrokerCommon.cpp
index b73eef33551e..b9137ccdad1a 100644
--- a/security/sandbox/linux/broker/SandboxBrokerCommon.cpp
+++ b/security/sandbox/linux/broker/SandboxBrokerCommon.cpp
@@ -34,9 +34,9 @@ const char* SandboxBrokerCommon::OperationDescription[] = {
     "open",  "access", "stat",  "chmod",  "link",     "symlink",
     "mkdir", "rename", "rmdir", "unlink", "readlink", "connect"};
 
-/* static */ ssize_t SandboxBrokerCommon::RecvWithFd(int aFd, const iovec* aIO,
-                                                     size_t aNumIO,
-                                                     int* aPassedFdPtr) {
+/* static */
+ssize_t SandboxBrokerCommon::RecvWithFd(int aFd, const iovec* aIO,
+                                        size_t aNumIO, int* aPassedFdPtr) {
   struct msghdr msg = {};
   msg.msg_iov = const_cast<iovec*>(aIO);
   msg.msg_iovlen = aNumIO;
@@ -93,9 +93,9 @@ const char* SandboxBrokerCommon::OperationDescription[] = {
   return rv;
 }
 
-/* static */ ssize_t SandboxBrokerCommon::SendWithFd(int aFd, const iovec* aIO,
-                                                     size_t aNumIO,
-                                                     int aPassedFd) {
+/* static */
+ssize_t SandboxBrokerCommon::SendWithFd(int aFd, const iovec* aIO,
+                                        size_t aNumIO, int aPassedFd) {
   struct msghdr msg = {};
   msg.msg_iov = const_cast<iovec*>(aIO);
   msg.msg_iovlen = aNumIO;
diff --git a/security/sandbox/linux/glue/SandboxPrefBridge.cpp b/security/sandbox/linux/glue/SandboxPrefBridge.cpp
index 458af14c4595..f5ab029016f5 100644
--- a/security/sandbox/linux/glue/SandboxPrefBridge.cpp
+++ b/security/sandbox/linux/glue/SandboxPrefBridge.cpp
@@ -13,8 +13,9 @@
 
 namespace mozilla {
 
-/* static */ ContentProcessSandboxParams
-ContentProcessSandboxParams::ForThisProcess(const dom::MaybeFileDesc& aBroker) {
+/* static */
+ContentProcessSandboxParams ContentProcessSandboxParams::ForThisProcess(
+    const dom::MaybeFileDesc& aBroker) {
   ContentProcessSandboxParams params;
   params.mLevel = GetEffectiveContentSandboxLevel();
 
diff --git a/security/sandbox/linux/reporter/SandboxReporter.cpp b/security/sandbox/linux/reporter/SandboxReporter.cpp
index 09ae918262f3..39a6612fef73 100644
--- a/security/sandbox/linux/reporter/SandboxReporter.cpp
+++ b/security/sandbox/linux/reporter/SandboxReporter.cpp
@@ -74,7 +74,8 @@ SandboxReporter::~SandboxReporter() {
   close(mClientFd);
 }
 
-/* static */ SandboxReporter* SandboxReporter::Singleton() {
+/* static */
+SandboxReporter* SandboxReporter::Singleton() {
   static StaticMutex sMutex;
   StaticMutexAutoLock lock(sMutex);
 
diff --git a/security/sandbox/win/src/sandboxtarget/sandboxTarget.cpp b/security/sandbox/win/src/sandboxtarget/sandboxTarget.cpp
index b0ed8094745c..19f126251b6d 100644
--- a/security/sandbox/win/src/sandboxtarget/sandboxTarget.cpp
+++ b/security/sandbox/win/src/sandboxtarget/sandboxTarget.cpp
@@ -12,7 +12,8 @@ namespace mozilla {
 
 // We need to define this function out of line so that clang-cl doesn't inline
 // it.
-/* static */ SandboxTarget* SandboxTarget::Instance() {
+/* static */
+SandboxTarget* SandboxTarget::Instance() {
   static SandboxTarget sb;
   return &sb;
 }