diff --git a/chapters/classes.tex b/chapters/classes.tex
index 2c7899995..970648d02 100644
--- a/chapters/classes.tex
+++ b/chapters/classes.tex
@@ -960,7 +960,7 @@ \section{Balanced Models}\doublelabel{balanced-models}
 components are included -- possibly modified. The corresponding
 restrictions on connectors and connections are in \autoref{restrictions-of-connections-and-connectors}.
 
-\textbf{Definition 1: Local Number of Unknowns}
+\numbereddefinition{Local Number of Unknowns}
 
 The \firstuse{local number of unknowns} of a model or block class is the sum based
 on the components:
@@ -991,7 +991,7 @@ \section{Balanced Models}\doublelabel{balanced-models}
   scalars of primitive types).
 \end{itemize}
 
-\textbf{Definition 2: Local Equation Size}
+\numbereddefinition{Local Equation Size}
 
 The \firstuse{local equation size} of a model or block class is the sum of the
 following numbers:
@@ -1034,7 +1034,7 @@ \section{Balanced Models}\doublelabel{balanced-models}
 supplied when using the model.
 \end{nonnormative}
 
-\textbf{Definition 3: Locally Balanced}
+\numbereddefinition{Locally Balanced}
 
 A model or block class is \firstuse{locally balanced} if the
 \emph{local number of unknowns} is identical to the \emph{local equation size} for all legal
@@ -1046,7 +1046,7 @@ \section{Balanced Models}\doublelabel{balanced-models}
 arrays of (locally) undefined sizes, conditional declarations, for loops etc.
 \end{nonnormative}
 
-\textbf{Definition 4: Globally Balanced}
+\numbereddefinition{Globally Balanced}
 
 Similarly as locally balanced, but including all unknowns and equations
 from all components. The global number of unknowns is computed by
diff --git a/chapters/interface.tex b/chapters/interface.tex
index 66c60b1ff..33fbc9675 100644
--- a/chapters/interface.tex
+++ b/chapters/interface.tex
@@ -462,7 +462,7 @@ \section{Plug-Compatibility or Restricted Subtyping}\doublelabel{plug-compatibil
 connected by default.
 \end{nonnormative}
 
-\textbf{Definition 5: Plug-compatibility (= restricted subtyping)}
+\numbereddefinition{Plug-compatibility (= restricted subtyping)}
 
 An interface \lstinline!A! is plug-compatible with (a restricted subtype of) an
 interface \lstinline!B! (or the constraining interface of \lstinline!B!) iff:
@@ -474,7 +474,7 @@ \section{Plug-Compatibility or Restricted Subtyping}\doublelabel{plug-compatibil
   default-connectable (as defined below).
 \end{itemize}
 
-\textbf{Definition 6: Default connectable}
+\numbereddefinition{Default connectable}
 
 A component of an interface is default-connectable iff:
 \begin{itemize}
@@ -577,7 +577,7 @@ \section{Function-Compatibility or Function-Subtyping for Functions}\doublelabel
 existing calls.
 \end{nonnormative}
 
-\textbf{Definition 7: Function-Compatibility or Function-Subtyping for Functions}
+\numbereddefinition{Function-Compatibility or Function-Subtyping for Functions}
 
 A function class \lstinline!A! is \emph{function-compatible with or a function
 subtype of} function class \lstinline!B! iff (the terms \emph{function-compatible}
diff --git a/preamble.tex b/preamble.tex
index 416c3d685..f9bfaa879 100644
--- a/preamble.tex
+++ b/preamble.tex
@@ -137,6 +137,15 @@
 
 \newcommand{\bibitemtitle}[1]{\emph{#1}}
 
+% henrikt-ma: Introducing semantic macro for 7 definitions spread out over two chapters
+% that for unclear reasons use their own style, including numbering.  Sorting out if numbered
+% definitions should be used more or not at all is part of issue #2570.
+\newcounter{defnumber}
+\newcommand{\numbereddefinition}[1]{%
+\stepcounter{defnumber}%
+\paragraph*{Definition~\thedefnumber: #1.}%
+}
+
 \setcounter{secnumdepth}{5}
 % Note: Toc changed for appendex
 \setcounter{tocdepth}{1}