Index: src/plugin/Config.h
===================================================================
--- a/src/plugin/Config.h
+++ b/src/plugin/Config.h
@@ -28,7 +28,6 @@
 
 #define ENABLE_DEBUG_RESULT
 #define ENABLE_DEBUG_RESULT_IGNORED
-#define ENABLE_DEBUG_SPLIT_FILE
 #else
 #undef ENABLE_DEBUG_INFO
 #endif
@@ -37,8 +36,6 @@
 #undef ENABLE_DEBUG_INFO
 #endif
 
-#undef ENABLE_DEBUG_SELFTEST
-
 #define DEBUG_FUNC CPluginDebug::Debug
 
 #if (defined ENABLE_DEBUG_INFO && defined ENABLE_DEBUG_GENERAL)
@@ -84,18 +81,17 @@
 #endif
 
 #if (defined ENABLE_DEBUG_INFO && defined ENABLE_DEBUG_ERROR)
-#define DEBUG_EXCEPTION(x) CPluginDebug::DebugException(x)
-#define DEBUG_ERROR_CODE(err, x) CPluginDebug::DebugErrorCode(err, x);
-#define DEBUG_ERROR_CODE_EX(err, x, process, thread) CPluginDebug::DebugErrorCode(err, x, process, thread);
+#define DEBUG_EXCEPTION(x) CPluginDebug::DebugException(x, Trace::Location())
+#define DEBUG_ERROR_CODE(err, x) CPluginDebug::DebugErrorCode(err, x, Trace::Location());
+#define DEBUG_ERROR_LOG(err, id, subid, description) Trace::ErrorCode(err, description, Trace::Location(id, subid))
+#define DEBUG_SYSTEM_EXCEPTION(ex, id, subid, description) Trace::SystemException(ex, description, Trace::Location(id, subid))
 #else
 #define DEBUG_EXCEPTION(x)
 #define DEBUG_ERROR_CODE(err, x)
-#define DEBUG_ERROR_CODE_EX(err, x, process, thread)
+#define DEBUG_ERROR_LOG(err, id, subid, description)
+#define DEBUG_SYSTEM_EXCEPTION(ex, id, subid, description)
 #endif
 
-#define DEBUG_ERROR_LOG(err, id, subid, description) LogQueue::PostPluginError(err, id, subid, description);
-#define DEBUG_SYSTEM_EXCEPTION(ex, id, subid, description) CPluginDebug::DebugSystemException(ex, id, subid, description)
-#define DEBUG_SELFTEST(x)
 
 // ----------------------------------------------------------------------------
 // Miscellaneous