diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index ef41d5c..4489326 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -169,55 +169,6 @@ jobs:
           path: |
             *.tar.gz
 
-  headless:
-    runs-on: ubuntu-20.04
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          submodules: recursive
-      - name: Set up dependencies
-        run: |
-          sudo apt-get update -qq
-          sudo apt-get remove -yqq libcairo2-dev libx11-dev libx11-dev libxext-dev
-          sudo apt-get install -yqq liblo-dev
-          sudo apt-get clean
-      - name: Build linux (headless)
-        run: |
-          make HEADLESS=true features
-          make HEADLESS=true -j $(nproc)
-
-  lto:
-    runs-on: ubuntu-20.04
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          submodules: recursive
-      - name: Set up dependencies
-        run: |
-          sudo apt-get update -qq
-          sudo apt-get install -yqq libasound2-dev libdbus-1-dev libgl1-mesa-dev liblo-dev libsdl2-dev libx11-dev libxcursor-dev libxext-dev libxrandr-dev gperf
-          sudo apt-get clean
-      - name: Build linux (LTO)
-        run: |
-          make features
-          make WITH_LTO=true -j $(nproc)
-
-  sysdeps:
-    runs-on: ubuntu-20.04
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          submodules: recursive
-      - name: Set up dependencies
-        run: |
-          sudo apt-get update -qq
-          sudo apt-get install -yqq libdbus-1-dev libgl1-mesa-dev liblo-dev libx11-dev libxcursor-dev libxext-dev libxrandr-dev libarchive-dev libfftw3-dev libjansson-dev libsamplerate0-dev libsndfile1-dev libspeexdsp-dev
-          sudo apt-get clean
-      - name: Build linux (sysdeps)
-        run: |
-          make features
-          make SYSDEPS=true -j $(nproc)
-
   macos:
     strategy:
       matrix:
@@ -559,6 +510,55 @@ jobs:
             Cardinal-*.exe
             Cardinal-*.zip
 
+  headless:
+    runs-on: ubuntu-20.04
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          submodules: recursive
+      - name: Set up dependencies
+        run: |
+          sudo apt-get update -qq
+          sudo apt-get remove -yqq libcairo2-dev libx11-dev libx11-dev libxext-dev
+          sudo apt-get install -yqq liblo-dev
+          sudo apt-get clean
+      - name: Build linux (headless)
+        run: |
+          make HEADLESS=true features
+          make HEADLESS=true -j $(nproc)
+
+  lto:
+    runs-on: ubuntu-20.04
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          submodules: recursive
+      - name: Set up dependencies
+        run: |
+          sudo apt-get update -qq
+          sudo apt-get install -yqq libasound2-dev libdbus-1-dev libgl1-mesa-dev liblo-dev libsdl2-dev libx11-dev libxcursor-dev libxext-dev libxrandr-dev gperf
+          sudo apt-get clean
+      - name: Build linux (LTO)
+        run: |
+          make features
+          make WITH_LTO=true -j $(nproc)
+
+  sysdeps:
+    runs-on: ubuntu-20.04
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          submodules: recursive
+      - name: Set up dependencies
+        run: |
+          sudo apt-get update -qq
+          sudo apt-get install -yqq libdbus-1-dev libgl1-mesa-dev liblo-dev libx11-dev libxcursor-dev libxext-dev libxrandr-dev libarchive-dev libfftw3-dev libjansson-dev libsamplerate0-dev libsndfile1-dev libspeexdsp-dev
+          sudo apt-get clean
+      - name: Build linux (sysdeps)
+        run: |
+          make features
+          make SYSDEPS=true -j $(nproc)
+
   source-tarball:
     runs-on: ubuntu-20.04
     steps:
diff --git a/README.md b/README.md
index 6ea7ff7..8215a39 100644
--- a/README.md
+++ b/README.md
@@ -248,7 +248,6 @@ Other relevant reasons include:
 
  - LV2 plugin version from the start
  - Proper dark mode support
- - Proper optimized build (because all code is compiled to a single file, we can use LTO over the whole thing)
  - Real CV ports to and from the plugin
  - Removing online access from the plugin and included modules (no phone-home here!)
  - Works as a test case for [DPF](https://github.com/DISTRHO/DPF/) and [Carla](https://github.com/falkTX/Carla/)
diff --git a/src/CardinalCommon.hpp b/src/CardinalCommon.hpp
index 3b59c69..9de27b8 100644
--- a/src/CardinalCommon.hpp
+++ b/src/CardinalCommon.hpp
@@ -75,8 +75,7 @@ void openBrowser(const std::string& url);
 
 // -----------------------------------------------------------------------------------------------------------
 
-// && defined(HEADLESS)
-#if defined(HAVE_LIBLO)
+#if defined(HAVE_LIBLO) && defined(HEADLESS)
 # define CARDINAL_INIT_OSC_THREAD
 #endif