Index: trunk/include/sh_trace.h
===================================================================
--- trunk/include/sh_trace.h	(revision 580)
+++ trunk/include/sh_trace.h	(revision 583)
@@ -5,4 +5,13 @@
 /* This file should be included via samhain.h only.
  */
+#ifdef SL_DEBUG
+#define SDG_0RETU _("return.\n")
+#define SDG_TERRO _("ERROR: file=<%s>, line=<%d>, reason=<%s>\n")
+#define SDG_AERRO _("ERROR: file=<%s>, line=<%d>, failed_assertion=<%s>\n")
+#define SDG_AFAIL _("FAILED: file=<%s>, line=<%d>, assertion=<%s>\n")
+#define SDG_ENTER _("enter=<%s>\n")
+#define SDG_RETUR _("return=<%s>.\n")
+#define SDG_ERROR _("error=<%ld>.\n")
+#endif
 
 #ifdef SL_DEBUG
Index: trunk/include/sh_unix.h
===================================================================
--- trunk/include/sh_unix.h	(revision 580)
+++ trunk/include/sh_unix.h	(revision 583)
@@ -391,14 +391,8 @@
 
 #ifdef HAVE_GETTIMEOFDAY
-#if TIME_WITH_SYS_TIME
-#include <sys/time.h>
-#include <time.h>
-#else
 #if HAVE_SYS_TIME_H
 #include <sys/time.h>
-#else
+#endif
 #include <time.h>
-#endif
-#endif
 #endif
 
Index: trunk/include/slib.h
===================================================================
--- trunk/include/slib.h	(revision 580)
+++ trunk/include/slib.h	(revision 583)
@@ -533,5 +533,5 @@
     /*@i@*/ if (assertion) ;                           \
     else {                                             \
-        dlog(0, FIL__, __LINE__, SDG_AFAIL,            \
+        dlog(0, FIL__, __LINE__, _("FAILED: file=<%s>, line=<%d>, assertion=<%s>\n"),            \
                  FIL__, __LINE__, astext);             \
         _exit(EXIT_FAILURE);                           \
@@ -621,5 +621,5 @@
 do {                                                                \
    if((long)(x) < 0) {                                              \
-      TPT((0,    FIL__, __LINE__, SDG_ERROR, (long)(x)))            \
+      TPT((0,    FIL__, __LINE__, _("error=<%ld>.\n"), (long)(x)))            \
       sl_errno=(x);                                                 \
     }                                                               \