diff --git a/app/app.pro b/app/app.pro
index 159c87eb..d36f0b82 100644
--- a/app/app.pro
+++ b/app/app.pro
@@ -448,9 +448,6 @@ wayland {
     SOURCES += streaming/video/ffmpeg-renderers/pacer/waylandvsyncsource.cpp
     HEADERS += streaming/video/ffmpeg-renderers/pacer/waylandvsyncsource.h
 }
-!disable-h264bitstream {
-    DEFINES += HAVE_H264BITSTREAM
-}
 
 RESOURCES += \
     resources.qrc \
diff --git a/app/streaming/video/ffmpeg.cpp b/app/streaming/video/ffmpeg.cpp
index 9d66fd50..faddf23e 100644
--- a/app/streaming/video/ffmpeg.cpp
+++ b/app/streaming/video/ffmpeg.cpp
@@ -3,9 +3,7 @@
 #include "utils.h"
 #include "streaming/session.h"
 
-#ifdef HAVE_H264BITSTREAM
 #include <h264_stream.h>
-#endif
 
 extern "C" {
 #include <libavutil/mastering_display_metadata.h>
@@ -717,13 +715,8 @@ bool FFmpegVideoDecoder::completeInitialization(const AVCodec* decoder, enum AVP
     if (testMode != TestMode::TestFrameOnly) {
         if ((params->videoFormat & VIDEO_FORMAT_MASK_H264) &&
                 !(m_BackendRenderer->getDecoderCapabilities() & CAPABILITY_REFERENCE_FRAME_INVALIDATION_AVC)) {
-#ifdef HAVE_H264BITSTREAM
             SDL_LogInfo(SDL_LOG_CATEGORY_APPLICATION,
                         "Using H.264 SPS fixup");
-#else
-            SDL_LogWarn(SDL_LOG_CATEGORY_APPLICATION,
-                        "H.264 SPS fixup cannot be performed without h264bitstream. H.264 may have excessive decoding latency!");
-#endif
             m_NeedsSpsFixup = true;
         }
         else {
@@ -1765,7 +1758,6 @@ bool FFmpegVideoDecoder::initialize(PDECODER_PARAMETERS params)
 
 void FFmpegVideoDecoder::writeBuffer(PLENTRY entry, int& offset)
 {
-#ifdef HAVE_H264BITSTREAM
     if (m_NeedsSpsFixup && entry->bufferType == BUFFER_TYPE_SPS) {
         h264_stream_t* stream = h264_new();
         int nalStart, nalEnd;
@@ -1820,9 +1812,7 @@ void FFmpegVideoDecoder::writeBuffer(PLENTRY entry, int& offset)
 
         h264_free(stream);
     }
-    else
-#endif
-    {
+    else {
         // Write the buffer as-is
         memcpy(&m_DecodeBuffer.data()[offset],
                entry->data,
diff --git a/moonlight-qt.pro b/moonlight-qt.pro
index e610ff81..c8d42006 100644
--- a/moonlight-qt.pro
+++ b/moonlight-qt.pro
@@ -2,20 +2,16 @@ TEMPLATE = subdirs
 SUBDIRS = \
     moonlight-common-c \
     qmdnsengine \
-    app
+    app \
+    h264bitstream
 
 # Build the dependencies in parallel before the final app
-app.depends = qmdnsengine moonlight-common-c
+app.depends = qmdnsengine moonlight-common-c h264bitstream
 win32:!winrt {
     SUBDIRS += AntiHooking
     app.depends += AntiHooking
 }
 
-!disable-h264bitstream {
-    SUBDIRS += h264bitstream
-    app.depends += h264bitstream
-}
-
 # Support debug and release builds from command line for CI
 CONFIG += debug_and_release