diff --git a/c++/carla-backend/carla_engine.cpp b/c++/carla-backend/carla_engine.cpp
index 98c11b6..57b2293 100644
--- a/c++/carla-backend/carla_engine.cpp
+++ b/c++/carla-backend/carla_engine.cpp
@@ -1209,7 +1209,7 @@ void CarlaEngine::osc_send_control_remove_plugin(const int32_t pluginId)
 
 void CarlaEngine::osc_send_control_set_plugin_data(const int32_t pluginId, const int32_t type, const int32_t category, const int32_t hints, const char* const realName, const char* const label, const char* const maker, const char* const copyright, const int64_t uniqueId)
 {
-    qDebug("CarlaEngine::osc_send_control_set_plugin_data(%i, %i, %i, %i, \"%s\", \"%s\", \"%s\", \"%s\", %li)", pluginId, type, category, hints, realName, label, maker, copyright, uniqueId);
+    qDebug("CarlaEngine::osc_send_control_set_plugin_data(%i, %i, %i, %i, \"%s\", \"%s\", \"%s\", \"%s\", " P_INT64 ")", pluginId, type, category, hints, realName, label, maker, copyright, uniqueId);
     Q_ASSERT(m_oscData);
     Q_ASSERT(pluginId >= 0 && pluginId < m_maxPluginNumber);
     Q_ASSERT(type != PLUGIN_NONE);
@@ -1597,7 +1597,7 @@ void CarlaEngine::osc_send_bridge_midi_program_count(const int32_t count)
 
 void CarlaEngine::osc_send_bridge_plugin_info(const int32_t category, const int32_t hints, const char* const name, const char* const label, const char* const maker, const char* const copyright, const int64_t uniqueId)
 {
-    qDebug("CarlaEngine::osc_send_bridge_plugin_info(%i, %i, \"%s\", \"%s\", \"%s\", \"%s\", %li)", category, hints, name, label, maker, copyright, uniqueId);
+    qDebug("CarlaEngine::osc_send_bridge_plugin_info(%i, %i, \"%s\", \"%s\", \"%s\", \"%s\", " P_INT64 ")", category, hints, name, label, maker, copyright, uniqueId);
     Q_ASSERT(m_oscData);
     Q_ASSERT(name);
     Q_ASSERT(label);
diff --git a/c++/carla-includes/carla_includes.h b/c++/carla-includes/carla_includes.h
index 3ccf857..c245ef5 100644
--- a/c++/carla-includes/carla_includes.h
+++ b/c++/carla-includes/carla_includes.h
@@ -57,14 +57,17 @@
 
 // needed for qDebug/Warning/Critical sections
 #if defined(Q_OS_WIN64) && ! defined(__WINE__)
+#  define P_INT64   "%I64i"
 #  define P_INTPTR  "%I64i"
 #  define P_UINTPTR "%I64x"
 #  define P_SIZE    "%I64u"
 #elif __WORDSIZE == 64
+#  define P_INT64   "%li"
 #  define P_INTPTR  "%li"
 #  define P_UINTPTR "%lx"
 #  define P_SIZE    "%lu"
 #else
+#  define P_INT64   "%lli"
 #  define P_INTPTR  "%i"
 #  define P_UINTPTR "%x"
 #  define P_SIZE    "%u"