diff --git a/tools/profiler/core/platform-linux-android.cpp b/tools/profiler/core/platform-linux-android.cpp
index a8ae2938dc79..19d0a5c56d41 100644
--- a/tools/profiler/core/platform-linux-android.cpp
+++ b/tools/profiler/core/platform-linux-android.cpp
@@ -69,7 +69,8 @@
 
 using namespace mozilla;
 
-/* static */ int Thread::GetCurrentId() { return gettid(); }
+/* static */
+int Thread::GetCurrentId() { return gettid(); }
 
 void* GetStackTop(void* aGuess) { return aGuess; }
 
diff --git a/tools/profiler/core/platform-macos.cpp b/tools/profiler/core/platform-macos.cpp
index aea7332974c1..b023dc2ea486 100644
--- a/tools/profiler/core/platform-macos.cpp
+++ b/tools/profiler/core/platform-macos.cpp
@@ -32,7 +32,8 @@
 
 // this port is based off of v8 svn revision 9837
 
-/* static */ int Thread::GetCurrentId() { return gettid(); }
+/* static */
+int Thread::GetCurrentId() { return gettid(); }
 
 void* GetStackTop(void* aGuess) {
   pthread_t thread = pthread_self();
diff --git a/tools/profiler/core/platform-win32.cpp b/tools/profiler/core/platform-win32.cpp
index 7b533b7c33dd..931dc968ba08 100644
--- a/tools/profiler/core/platform-win32.cpp
+++ b/tools/profiler/core/platform-win32.cpp
@@ -36,7 +36,8 @@
 #include "mozilla/StackWalk_windows.h"
 #include "mozilla/WindowsVersion.h"
 
-/* static */ int Thread::GetCurrentId() {
+/* static */
+int Thread::GetCurrentId() {
   DWORD threadId = GetCurrentThreadId();
   MOZ_ASSERT(threadId <= INT32_MAX, "native thread ID is > INT32_MAX");
   return int(threadId);
diff --git a/tools/profiler/gecko/ChildProfilerController.cpp b/tools/profiler/gecko/ChildProfilerController.cpp
index 444f64aa0343..0f27e947ba02 100644
--- a/tools/profiler/gecko/ChildProfilerController.cpp
+++ b/tools/profiler/gecko/ChildProfilerController.cpp
@@ -14,8 +14,8 @@ using namespace mozilla::ipc;
 
 namespace mozilla {
 
-/* static */ already_AddRefed<ChildProfilerController>
-ChildProfilerController::Create(
+/* static */
+already_AddRefed<ChildProfilerController> ChildProfilerController::Create(
     mozilla::ipc::Endpoint<PProfilerChild>&& aEndpoint) {
   MOZ_RELEASE_ASSERT(NS_IsMainThread());
   RefPtr<ChildProfilerController> cpc = new ChildProfilerController();
diff --git a/tools/profiler/gecko/ProfilerParent.cpp b/tools/profiler/gecko/ProfilerParent.cpp
index b3eed2c2ba69..2d968fd9bc3b 100644
--- a/tools/profiler/gecko/ProfilerParent.cpp
+++ b/tools/profiler/gecko/ProfilerParent.cpp
@@ -36,8 +36,8 @@ class ProfilerParentTracker final {
 
 UniquePtr<ProfilerParentTracker> ProfilerParentTracker::sInstance;
 
-/* static */ void ProfilerParentTracker::StartTracking(
-    ProfilerParent* aProfilerParent) {
+/* static */
+void ProfilerParentTracker::StartTracking(ProfilerParent* aProfilerParent) {
   if (!sInstance) {
     sInstance = MakeUnique<ProfilerParentTracker>();
     ClearOnShutdown(&sInstance);
@@ -45,14 +45,16 @@ UniquePtr<ProfilerParentTracker> ProfilerParentTracker::sInstance;
   sInstance->mProfilerParents.AppendElement(aProfilerParent);
 }
 
-/* static */ void ProfilerParentTracker::StopTracking(ProfilerParent* aParent) {
+/* static */
+void ProfilerParentTracker::StopTracking(ProfilerParent* aParent) {
   if (sInstance) {
     sInstance->mProfilerParents.RemoveElement(aParent);
   }
 }
 
 template <typename FuncType>
-/* static */ void ProfilerParentTracker::Enumerate(FuncType aIterFunc) {
+/* static */
+void ProfilerParentTracker::Enumerate(FuncType aIterFunc) {
   if (sInstance) {
     for (ProfilerParent* profilerParent : sInstance->mProfilerParents) {
       if (!profilerParent->mDestroyed) {
@@ -82,7 +84,8 @@ ProfilerParentTracker::~ProfilerParentTracker() {
   }
 }
 
-/* static */ Endpoint<PProfilerChild> ProfilerParent::CreateForProcess(
+/* static */
+Endpoint<PProfilerChild> ProfilerParent::CreateForProcess(
     base::ProcessId aOtherPid) {
   MOZ_RELEASE_ASSERT(NS_IsMainThread());
   Endpoint<PProfilerParent> parent;
@@ -173,8 +176,8 @@ ProfilerParent::GatherProfiles() {
   return results;
 }
 
-/* static */ void ProfilerParent::ProfilerStarted(
-    nsIProfilerStartParams* aParams) {
+/* static */
+void ProfilerParent::ProfilerStarted(nsIProfilerStartParams* aParams) {
   if (!NS_IsMainThread()) {
     return;
   }
@@ -198,7 +201,8 @@ ProfilerParent::GatherProfiles() {
   });
 }
 
-/* static */ void ProfilerParent::ProfilerStopped() {
+/* static */
+void ProfilerParent::ProfilerStopped() {
   if (!NS_IsMainThread()) {
     return;
   }
@@ -208,7 +212,8 @@ ProfilerParent::GatherProfiles() {
   });
 }
 
-/* static */ void ProfilerParent::ProfilerPaused() {
+/* static */
+void ProfilerParent::ProfilerPaused() {
   if (!NS_IsMainThread()) {
     return;
   }
@@ -218,7 +223,8 @@ ProfilerParent::GatherProfiles() {
   });
 }
 
-/* static */ void ProfilerParent::ProfilerResumed() {
+/* static */
+void ProfilerParent::ProfilerResumed() {
   if (!NS_IsMainThread()) {
     return;
   }