diff --git a/akka-parsing/src/main/scala/akka/http/ccompat/pre213macro.scala b/akka-parsing/src/main/scala-2/akka/http/ccompat/pre213macro.scala
similarity index 100%
rename from akka-parsing/src/main/scala/akka/http/ccompat/pre213macro.scala
rename to akka-parsing/src/main/scala-2/akka/http/ccompat/pre213macro.scala
diff --git a/akka-parsing/src/main/scala/akka/http/ccompat/since213macro.scala b/akka-parsing/src/main/scala-2/akka/http/ccompat/since213macro.scala
similarity index 100%
rename from akka-parsing/src/main/scala/akka/http/ccompat/since213macro.scala
rename to akka-parsing/src/main/scala-2/akka/http/ccompat/since213macro.scala
diff --git a/akka-parsing/src/main/scala-3/akka/http/ccompat/pre213macro.scala b/akka-parsing/src/main/scala-3/akka/http/ccompat/pre213macro.scala
new file mode 100644
index 00000000000..91d936c0153
--- /dev/null
+++ b/akka-parsing/src/main/scala-3/akka/http/ccompat/pre213macro.scala
@@ -0,0 +1,10 @@
+/*
+ * Copyright (C) 2019-2021 Lightbend Inc. <https://www.lightbend.com>
+ */
+
+package akka.http.ccompat
+
+import scala.annotation.StaticAnnotation
+
+// FIXME: need to implement or we will resurrect some ugly things (or remove 2.12 support)
+class pre213 extends StaticAnnotation
diff --git a/akka-parsing/src/main/scala-3/akka/http/ccompat/since213macro.scala b/akka-parsing/src/main/scala-3/akka/http/ccompat/since213macro.scala
new file mode 100644
index 00000000000..5dc84ee1599
--- /dev/null
+++ b/akka-parsing/src/main/scala-3/akka/http/ccompat/since213macro.scala
@@ -0,0 +1,9 @@
+/*
+ * Copyright (C) 2019-2021 Lightbend Inc. <https://www.lightbend.com>
+ */
+
+package akka.http.ccompat
+
+import scala.annotation.StaticAnnotation
+
+class since213 extends StaticAnnotation