diff --git a/wrapper/C99/C99Canvas.cpp b/wrapper/C99/C99Canvas.cpp
index 5a01c8ca73..e8c7c7cbf6 100644
--- a/wrapper/C99/C99Canvas.cpp
+++ b/wrapper/C99/C99Canvas.cpp
@@ -9,6 +9,7 @@
 #include <LLGL-C/Canvas.h>
 #include "C99Internal.h"
 #include "../sources/Core/CoreUtils.h"
+#include "../sources/Core/Exception.h"
 #include <vector>
 #include <string>
 #include <string.h>
@@ -20,7 +21,7 @@
 using namespace LLGL;
 
 #define LLGL_CALLBACK_WRAPPER(FUNC, ...) \
-    if (callbacks_.FUNC != NULL) { callbacks_.FUNC(LLGLCanvas{ &sender }, __VA_ARGS__); }
+    if (callbacks_.FUNC != NULL) { callbacks_.FUNC(LLGLCanvas{ &sender } LLGL_VA_ARGS(__VA_ARGS__)); }
 
 class InternalCanvasEventListener final : public Canvas::EventListener
 {
diff --git a/wrapper/C99/C99Window.cpp b/wrapper/C99/C99Window.cpp
index 06732d189e..dc3122a9c4 100644
--- a/wrapper/C99/C99Window.cpp
+++ b/wrapper/C99/C99Window.cpp
@@ -9,6 +9,7 @@
 #include <LLGL-C/Window.h>
 #include "C99Internal.h"
 #include "../sources/Core/CoreUtils.h"
+#include "../sources/Core/Exception.h"
 #include <vector>
 #include <string>
 #include <string.h>
@@ -21,7 +22,7 @@
 using namespace LLGL;
 
 #define LLGL_CALLBACK_WRAPPER(FUNC, ...) \
-    if (callbacks_.FUNC != NULL) { callbacks_.FUNC(LLGLWindow{ &sender }, __VA_ARGS__); }
+    if (callbacks_.FUNC != NULL) { callbacks_.FUNC(LLGLWindow{ &sender } LLGL_VA_ARGS(__VA_ARGS__)); }
 
 class InternalWindowEventListener final : public Window::EventListener
 {