src/omemo/crypto.h

@@ -8,7 +8,14 @@
  */
 #include <stdio.h>
 #include <stdbool.h>
+#include "config.h"
+
+#ifdef HAVE_LIBOMEMO_C
+#include <omemo/signal_protocol_types.h>
+#else
 #include <signal/signal_protocol_types.h>
+#endif
+
 #include <gcrypt.h>
 
 #define AES128_GCM_KEY_LENGTH 16

src/omemo/store.c

@@ -7,6 +7,7 @@
  * SPDX-License-Identifier: GPL-3.0-or-later WITH OpenSSL-exception
  */
 #include <glib.h>
+#include "config.h"
 
 #ifdef HAVE_LIBOMEMO_C
 #include <omemo/signal_protocol.h>
@@ -14,7 +15,6 @@
 #include <signal/signal_protocol.h>
 #endif
 
-#include "config.h"
 #include "log.h"
 #include "omemo/omemo.h"
 #include "omemo/store.h"

src/omemo/store.h

@@ -6,10 +6,14 @@
  *
  * SPDX-License-Identifier: GPL-3.0-or-later WITH OpenSSL-exception
  */
-#include <signal/signal_protocol.h>
-
 #include "config.h"
 
+#ifdef HAVE_LIBOMEMO_C
+#include <omemo/signal_protocol.h>
+#else
+#include <signal/signal_protocol.h>
+#endif
+
 #define OMEMO_STORE_GROUP_IDENTITY           "identity"
 #define OMEMO_STORE_GROUP_PREKEYS            "prekeys"
 #define OMEMO_STORE_GROUP_SIGNED_PREKEYS     "signed_prekeys"