diff -up src/sage/env.py.orig src/sage/env.py
--- src/sage/env.py.orig	2022-01-30 06:41:50.000000000 -0700
+++ src/sage/env.py	2022-03-04 16:04:55.067452303 -0700
@@ -496,7 +496,8 @@ def cython_aliases(required_modules=None
         aliases[var + "INCDIR"] = pc['include_dirs']
         aliases[var + "LIBDIR"] = pc['library_dirs']
         aliases[var + "LIBEXTRA"] = list(filter(lambda s: not s.startswith(('-l','-L')), libs.split()))
-        aliases[var + "LIBRARIES"] = pc['libraries']
+        aliases[var + "LIBRARIES"] = pc['libraries'] + ['gomp']
+    aliases['Singular_INCDIR'] = ['/usr/include/singular', '/usr/include/factory']
 
     # uname-specific flags
     UNAME = os.uname()
diff -up src/sage/graphs/mcqd.pyx.orig src/sage/graphs/mcqd.pyx
--- src/sage/graphs/mcqd.pyx.orig	2022-03-04 16:04:55.068452305 -0700
+++ src/sage/graphs/mcqd.pyx	2022-03-04 16:05:55.226537259 -0700
@@ -1,4 +1,5 @@
 # distutils: language = c++
+# distutils: libraries = mcqd
 # sage_setup: distribution = sagemath-mcqd
 
 from cysignals.signals cimport sig_on, sig_off
diff -up src/sage/libs/arb/arb.pxd.orig src/sage/libs/arb/arb.pxd
--- src/sage/libs/arb/arb.pxd.orig	2022-01-30 06:41:50.000000000 -0700
+++ src/sage/libs/arb/arb.pxd	2022-03-04 16:05:03.939464830 -0700
@@ -1,4 +1,5 @@
 # distutils: libraries = gmp flint ARB_LIBRARY
+# distutils: include_dirs = /usr/include/arb /usr/include/flint
 # distutils: depends = arb.h
 
 from sage.libs.arb.types cimport *
diff -up src/sage/libs/arb/arb_version.pyx.orig src/sage/libs/arb/arb_version.pyx
--- src/sage/libs/arb/arb_version.pyx.orig	2022-01-30 06:41:50.000000000 -0700
+++ src/sage/libs/arb/arb_version.pyx	2022-03-04 16:05:03.939464830 -0700
@@ -1,4 +1,5 @@
 # -*- coding: utf-8
+# distutils: include_dirs = /usr/include/arb /usr/include/flint
 from sage.libs.arb.arb cimport arb_version 
 from sage.cpython.string cimport char_to_str
 
diff -up src/sage/libs/arb/arith.pyx.orig src/sage/libs/arb/arith.pyx
--- src/sage/libs/arb/arith.pyx.orig	2022-01-30 06:41:50.000000000 -0700
+++ src/sage/libs/arb/arith.pyx	2022-03-04 16:05:03.939464830 -0700
@@ -1,3 +1,4 @@
+# distutils: include_dirs = /usr/include/arb /usr/include/flint
 """
 Arithmetic functions using the arb library
 """
diff -up src/sage/libs/mpmath/ext_impl.pyx.orig src/sage/libs/mpmath/ext_impl.pyx
--- src/sage/libs/mpmath/ext_impl.pyx.orig	2022-01-30 06:41:50.000000000 -0700
+++ src/sage/libs/mpmath/ext_impl.pyx	2022-03-04 16:05:03.939464830 -0700
@@ -1,3 +1,4 @@
+# distutils: include_dirs = /usr/include/flint
 """
 This module provides the core implementation of multiprecision
 floating-point arithmetic. Operations are done in-place.
diff -up src/sage/libs/mpmath/ext_libmp.pyx.orig src/sage/libs/mpmath/ext_libmp.pyx
--- src/sage/libs/mpmath/ext_libmp.pyx.orig	2022-01-30 06:41:50.000000000 -0700
+++ src/sage/libs/mpmath/ext_libmp.pyx	2022-03-04 16:05:03.940464832 -0700
@@ -1,3 +1,4 @@
+# distutils: include_dirs = /usr/include/flint
 """
 Faster versions of some key functions in mpmath.libmp
 """
diff -up src/sage/libs/mpmath/ext_main.pyx.orig src/sage/libs/mpmath/ext_main.pyx
--- src/sage/libs/mpmath/ext_main.pyx.orig	2022-01-30 06:41:50.000000000 -0700
+++ src/sage/libs/mpmath/ext_main.pyx	2022-03-04 16:05:03.940464832 -0700
@@ -1,3 +1,4 @@
+# distutils: include_dirs = /usr/include/flint
 """
 mpmath floating-point numbers
 
diff -up src/sage/libs/mpmath/utils.pyx.orig src/sage/libs/mpmath/utils.pyx
--- src/sage/libs/mpmath/utils.pyx.orig	2022-01-30 06:41:50.000000000 -0700
+++ src/sage/libs/mpmath/utils.pyx	2022-03-04 16:05:03.940464832 -0700
@@ -1,3 +1,4 @@
+# distutils: include_dirs = /usr/include/flint
 """
 Utilities for Sage-mpmath interaction
 
diff -up src/sage/matrix/matrix_complex_ball_dense.pyx.orig src/sage/matrix/matrix_complex_ball_dense.pyx
--- src/sage/matrix/matrix_complex_ball_dense.pyx.orig	2022-01-30 06:41:50.000000000 -0700
+++ src/sage/matrix/matrix_complex_ball_dense.pyx	2022-03-04 16:05:03.941464833 -0700
@@ -1,4 +1,5 @@
 # distutils: libraries = ARB_LIBRARY
+# distutils: include_dirs = /usr/include/arb /usr/include/flint
 r"""
 Arbitrary precision complex ball matrices using Arb
 
diff -up src/sage/matrix/matrix_cyclo_dense.pyx.orig src/sage/matrix/matrix_cyclo_dense.pyx
--- src/sage/matrix/matrix_cyclo_dense.pyx.orig	2022-01-30 06:41:50.000000000 -0700
+++ src/sage/matrix/matrix_cyclo_dense.pyx	2022-03-04 16:05:03.941464833 -0700
@@ -1,7 +1,7 @@
 # distutils: language = c++
 # distutils: libraries = NTL_LIBRARIES
 # distutils: extra_compile_args = NTL_CFLAGS
-# distutils: include_dirs = NTL_INCDIR
+# distutils: include_dirs = NTL_INCDIR /usr/include/arb /usr/include/flint
 # distutils: library_dirs = NTL_LIBDIR
 # distutils: extra_link_args = NTL_LIBEXTRA
 """
diff -up src/sage/matrix/matrix_mpolynomial_dense.pyx.orig src/sage/matrix/matrix_mpolynomial_dense.pyx
--- src/sage/matrix/matrix_mpolynomial_dense.pyx.orig	2022-01-30 06:41:50.000000000 -0700
+++ src/sage/matrix/matrix_mpolynomial_dense.pyx	2022-03-04 16:05:03.941464833 -0700
@@ -1,3 +1,4 @@
+# distutils: include_dirs = /usr/include/singular /usr/include/factory
 """
 Dense matrices over multivariate polynomials over fields
 
diff -up src/sage/rings/complex_arb.pyx.orig src/sage/rings/complex_arb.pyx
--- src/sage/rings/complex_arb.pyx.orig	2022-01-30 06:41:50.000000000 -0700
+++ src/sage/rings/complex_arb.pyx	2022-03-04 16:05:03.942464834 -0700
@@ -1,4 +1,5 @@
 # -*- coding: utf-8
+# distutils: include_dirs = /usr/include/arb /usr/include/flint
 r"""
 Arbitrary precision complex balls using Arb
 
diff -up src/sage/rings/number_field/number_field_element_quadratic.pyx.orig src/sage/rings/number_field/number_field_element_quadratic.pyx
--- src/sage/rings/number_field/number_field_element_quadratic.pyx.orig	2022-01-30 06:41:50.000000000 -0700
+++ src/sage/rings/number_field/number_field_element_quadratic.pyx	2022-03-04 16:05:03.942464834 -0700
@@ -4,6 +4,7 @@
 # distutils: library_dirs = NTL_LIBDIR
 # distutils: extra_link_args = NTL_LIBEXTRA
 # distutils: language = c++
+# distutils: include_dirs = /usr/include/arb /usr/include/flint
 """
 Optimized Quadratic Number Field Elements
 
diff -up src/sage/rings/polynomial/multi_polynomial_libsingular.pyx.orig src/sage/rings/polynomial/multi_polynomial_libsingular.pyx
--- src/sage/rings/polynomial/multi_polynomial_libsingular.pyx.orig	2022-03-04 15:50:57.344269364 -0700
+++ src/sage/rings/polynomial/multi_polynomial_libsingular.pyx	2022-03-04 16:05:03.943464836 -0700
@@ -1,3 +1,4 @@
+# distutils: include_dirs = /usr/include/singular /usr/include/factory
 r"""
 Multivariate Polynomials via libSINGULAR
 
diff -up src/sage/rings/polynomial/multi_polynomial.pyx.orig src/sage/rings/polynomial/multi_polynomial.pyx
--- src/sage/rings/polynomial/multi_polynomial.pyx.orig	2022-01-30 06:41:50.000000000 -0700
+++ src/sage/rings/polynomial/multi_polynomial.pyx	2022-03-04 16:05:03.944464837 -0700
@@ -1,3 +1,4 @@
+# distutils: include_dirs = /usr/include/singular /usr/include/factory
 r"""
 Base class for elements of multivariate polynomial rings
 """
diff -up src/sage/rings/polynomial/plural.pyx.orig src/sage/rings/polynomial/plural.pyx
--- src/sage/rings/polynomial/plural.pyx.orig	2022-01-30 06:41:50.000000000 -0700
+++ src/sage/rings/polynomial/plural.pyx	2022-03-04 16:05:03.944464837 -0700
@@ -1,3 +1,4 @@
+# distutils: include_dirs = /usr/include/singular /usr/include/factory
 r"""
 Noncommutative Polynomials via libSINGULAR/Plural
 
diff -up src/sage/rings/polynomial/polynomial_complex_arb.pyx.orig src/sage/rings/polynomial/polynomial_complex_arb.pyx
--- src/sage/rings/polynomial/polynomial_complex_arb.pyx.orig	2022-01-30 06:41:50.000000000 -0700
+++ src/sage/rings/polynomial/polynomial_complex_arb.pyx	2022-03-04 16:05:03.944464837 -0700
@@ -1,4 +1,5 @@
 # -*- coding: utf-8
+# distutils: include_dirs = /usr/include/arb /usr/include/flint
 r"""
 Univariate polynomials over `\CC` with interval coefficients using Arb.
 
diff -up src/sage/rings/real_arb.pyx.orig src/sage/rings/real_arb.pyx
--- src/sage/rings/real_arb.pyx.orig	2022-01-30 06:41:50.000000000 -0700
+++ src/sage/rings/real_arb.pyx	2022-03-04 16:05:03.945464839 -0700
@@ -1,4 +1,5 @@
 # -*- coding: utf-8
+# distutils: include_dirs = /usr/include/arb /usr/include/flint
 r"""
 Arbitrary precision real balls using Arb
 
diff -up src/sage_setup/command/sage_build_cython.py.orig src/sage_setup/command/sage_build_cython.py
--- src/sage_setup/command/sage_build_cython.py.orig	2022-01-30 06:41:50.000000000 -0700
+++ src/sage_setup/command/sage_build_cython.py	2022-03-04 16:05:03.945464839 -0700
@@ -209,6 +209,7 @@ class sage_build_cython(Command):
         self.library_order = library_order
         # Search for dependencies in the source tree and add to the list of include directories
         self.sage_include_dirs = sage_include_directories(use_sources=True)
+        self.sage_include_dirs.extend(['@@CYSIGNALS@@'])
 
         from Cython.Build import cythonize
         import Cython.Compiler.Options