-#include "transport_session.h"
+#include "opensrf/transport_session.h"
#include <time.h>
-#ifdef DMALLOC
-#include "dmalloc.h"
-#endif
-
#ifndef TRANSPORT_CLIENT_H
#define TRANSPORT_CLIENT_H
#include "libxml.h"
-#include "generic_utils.h"
+#include "opensrf/generic_utils.h"
#include <string.h>
#include <libxml/globals.h>
#include <libxml/debugXML.h>
#include <libxml/xmlmemory.h>
-#ifdef DMALLOC
-#include "dmalloc.h"
-#endif
-
#ifndef TRANSPORT_MESSAGE_H
#define TRANSPORT_MESSAGE_H
// logic ensues.
// ---------------------------------------------------------------------------------
#include "libxml.h"
-#include "transport_socket.h"
-#include "transport_message.h"
-#include "generic_utils.h"
+#include "opensrf/transport_socket.h"
+#include "opensrf/transport_message.h"
+#include "opensrf/generic_utils.h"
#include <string.h>
#include <libxml/globals.h>
#define JABBER_JID_BUFSIZE 64
#define JABBER_STATUS_BUFSIZE 16
-#ifdef DMALLOC
-#include "dmalloc.h"
-#endif
-
// ---------------------------------------------------------------------------------
// Takes data from the socket handler and pushes it directly into the push parser
// ---------------------------------------------------------------------------------
-#include "generic_utils.h"
+#include "opensrf/generic_utils.h"
#include <stdio.h>
#include <stdlib.h>
#include <netinet/in.h>
#endif
-#ifdef DMALLOC
-#include "dmalloc.h"
-#endif
-
#ifndef TRANSPORT_SOCKET_H
#define TRANSPORT_SOCKET_H