diff --git a/include/proxysql.h b/include/proxysql.h
index 522bd4d1d..a563732cc 100644
--- a/include/proxysql.h
+++ b/include/proxysql.h
@@ -70,16 +70,7 @@
 #endif // __APPLE__ and __MACH__
 #endif // NOJEM
 
-#ifdef DEBUG
-//#define VALGRIND_ENABLE_ERROR_REPORTING
-//#define VALGRIND_DISABLE_ERROR_REPORTING
-#include "valgrind.h"
-#else
-#define VALGRIND_ENABLE_ERROR_REPORTING
-#define VALGRIND_DISABLE_ERROR_REPORTING
-#endif /* DEBUG */
-
-#include "sqlite3.h"
+//#include "sqlite3.h"
 
 #include "c_tokenizer.h"
 
diff --git a/lib/MySQL_Monitor.cpp b/lib/MySQL_Monitor.cpp
index 530c40a0b..49ce4cfa4 100644
--- a/lib/MySQL_Monitor.cpp
+++ b/lib/MySQL_Monitor.cpp
@@ -39,6 +39,15 @@ using json = nlohmann::json;
 #endif /* DEBUG */
 #define MYSQL_MONITOR_VERSION "2.0.1226" DEB
 
+#ifdef DEBUG
+//#define VALGRIND_ENABLE_ERROR_REPORTING
+//#define VALGRIND_DISABLE_ERROR_REPORTING
+#include "valgrind.h"
+#else
+#define VALGRIND_ENABLE_ERROR_REPORTING
+#define VALGRIND_DISABLE_ERROR_REPORTING
+#endif // DEBUG
+
 extern ProxySQL_Admin *GloAdmin;
 extern MySQL_Threads_Handler *GloMTH;
 extern ProxySQL_Cluster* GloProxyCluster;
diff --git a/lib/set_parser.cpp b/lib/set_parser.cpp
index 521808d64..219f12723 100644
--- a/lib/set_parser.cpp
+++ b/lib/set_parser.cpp
@@ -7,6 +7,15 @@
 #include <iostream>
 #endif
 
+#ifdef DEBUG
+//#define VALGRIND_ENABLE_ERROR_REPORTING
+//#define VALGRIND_DISABLE_ERROR_REPORTING
+#include "valgrind.h"
+#else
+#define VALGRIND_ENABLE_ERROR_REPORTING
+#define VALGRIND_DISABLE_ERROR_REPORTING
+#endif // DEBUG
+
 using namespace std;
 
 
diff --git a/lib/sqlite3db.cpp b/lib/sqlite3db.cpp
index e5652a446..75c315e86 100644
--- a/lib/sqlite3db.cpp
+++ b/lib/sqlite3db.cpp
@@ -6,6 +6,15 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 
+#ifdef DEBUG
+//#define VALGRIND_ENABLE_ERROR_REPORTING
+//#define VALGRIND_DISABLE_ERROR_REPORTING
+#include "valgrind.h"
+#else
+#define VALGRIND_ENABLE_ERROR_REPORTING
+#define VALGRIND_DISABLE_ERROR_REPORTING
+#endif // DEBUG
+
 #define USLEEP_SQLITE_LOCKED 100