diff --git a/libs/openzap/Makefile.in b/libs/openzap/Makefile.in
index 03454e6677..6c3bb534e5 100644
--- a/libs/openzap/Makefile.in
+++ b/libs/openzap/Makefile.in
@@ -46,6 +46,7 @@ $(SRC)/libteletone_detect.c \
 $(SRC)/libteletone_generate.c \
 $(SRC)/zap_buffer.c \
 $(SRC)/zap_threadmutex.c \
+$(SRC)/zap_dso.c \
 $(SRC)/isdn/EuroISDNStateNT.c \
 $(SRC)/isdn/EuroISDNStateTE.c \
 $(SRC)/isdn/mfifo.c \
@@ -86,6 +87,7 @@ $(SRC)/libteletone_detect.o \
 $(SRC)/libteletone_generate.o \
 $(SRC)/zap_buffer.o \
 $(SRC)/zap_threadmutex.o \
+$(SRC)/zap_dso.o \
 $(SRC)/isdn/EuroISDNStateNT.o \
 $(SRC)/isdn/EuroISDNStateTE.o \
 $(SRC)/isdn/mfifo.o \
@@ -129,6 +131,7 @@ $(SRC)/include/zap_config.h \
 $(SRC)/include/zap_isdn.h \
 $(SRC)/include/zap_skel.h \
 $(SRC)/include/zap_threadmutex.h \
+$(SRC)/include/zap_dso.h \
 $(SRC)/include/zap_types.h \
 $(SRC)/include/zap_wanpipe.h \
 $(SRC)/include/zap_ss7_boost.h \
diff --git a/libs/openzap/src/include/zap_dso.h b/libs/openzap/src/include/zap_dso.h
index e4337e64db..2c7be2b4be 100644
--- a/libs/openzap/src/include/zap_dso.h
+++ b/libs/openzap/src/include/zap_dso.h
@@ -1,25 +1,25 @@
-/* 
- * Cross Platform dso/dll load abstraction
- * Copyright(C) 2008 Michael Jerris
- *
- * You may opt to use, copy, modify, merge, publish, distribute and/or sell
- * copies of the Software, and permit persons to whom the Software is
- * furnished to do so.
- *
- * This work is provided under this license on an "as is" basis, without warranty of any kind,
- * either expressed or implied, including, without limitation, warranties that the covered code
- * is free of defects, merchantable, fit for a particular purpose or non-infringing. The entire
- * risk as to the quality and performance of the covered code is with you. Should any covered
- * code prove defective in any respect, you (not the initial developer or any other contributor)
- * assume the cost of any necessary servicing, repair or correction. This disclaimer of warranty
- * constitutes an essential part of this license. No use of any covered code is authorized hereunder
- * except under this disclaimer. 
- *
- */
-
-
-#ifndef _ZAP_DSO_H
-#define _ZAP_DSO_H
+/* 
+ * Cross Platform dso/dll load abstraction
+ * Copyright(C) 2008 Michael Jerris
+ *
+ * You may opt to use, copy, modify, merge, publish, distribute and/or sell
+ * copies of the Software, and permit persons to whom the Software is
+ * furnished to do so.
+ *
+ * This work is provided under this license on an "as is" basis, without warranty of any kind,
+ * either expressed or implied, including, without limitation, warranties that the covered code
+ * is free of defects, merchantable, fit for a particular purpose or non-infringing. The entire
+ * risk as to the quality and performance of the covered code is with you. Should any covered
+ * code prove defective in any respect, you (not the initial developer or any other contributor)
+ * assume the cost of any necessary servicing, repair or correction. This disclaimer of warranty
+ * constitutes an essential part of this license. No use of any covered code is authorized hereunder
+ * except under this disclaimer. 
+ *
+ */
+
+
+#ifndef _ZAP_DSO_H
+#define _ZAP_DSO_H
 
 typedef void (*zap_func_ptr_t) (void);
 typedef void * zap_dso_lib_t;
@@ -29,16 +29,16 @@ zap_dso_lib_t zap_dso_open(const char *path, const char **err);
 zap_func_ptr_t zap_dso_func_sym(zap_dso_lib_t lib, const char *sym, const char **err);
 
 
-#endif
-
-/* For Emacs:
- * Local Variables:
- * mode:c
- * indent-tabs-mode:t
- * tab-width:4
- * c-basic-offset:4
- * End:
- * For VIM:
- * vim:set softtabstop=4 shiftwidth=4 tabstop=4
- */
-
+#endif
+
+/* For Emacs:
+ * Local Variables:
+ * mode:c
+ * indent-tabs-mode:t
+ * tab-width:4
+ * c-basic-offset:4
+ * End:
+ * For VIM:
+ * vim:set softtabstop=4 shiftwidth=4 tabstop=4
+ */
+
diff --git a/libs/openzap/src/zap_dso.c b/libs/openzap/src/zap_dso.c
index cbcc5914c8..aceaa5f5e5 100644
--- a/libs/openzap/src/zap_dso.c
+++ b/libs/openzap/src/zap_dso.c
@@ -1,22 +1,25 @@
-/* 
- * Cross Platform dso/dll load abstraction
- * Copyright(C) 2008 Michael Jerris
- *
- * You may opt to use, copy, modify, merge, publish, distribute and/or sell
- * copies of the Software, and permit persons to whom the Software is
- * furnished to do so.
- *
- * This work is provided under this license on an "as is" basis, without warranty of any kind,
- * either expressed or implied, including, without limitation, warranties that the covered code
- * is free of defects, merchantable, fit for a particular purpose or non-infringing. The entire
- * risk as to the quality and performance of the covered code is with you. Should any covered
- * code prove defective in any respect, you (not the initial developer or any other contributor)
- * assume the cost of any necessary servicing, repair or correction. This disclaimer of warranty
- * constitutes an essential part of this license. No use of any covered code is authorized hereunder
- * except under this disclaimer. 
- *
- */
+/* 
+ * Cross Platform dso/dll load abstraction
+ * Copyright(C) 2008 Michael Jerris
+ *
+ * You may opt to use, copy, modify, merge, publish, distribute and/or sell
+ * copies of the Software, and permit persons to whom the Software is
+ * furnished to do so.
+ *
+ * This work is provided under this license on an "as is" basis, without warranty of any kind,
+ * either expressed or implied, including, without limitation, warranties that the covered code
+ * is free of defects, merchantable, fit for a particular purpose or non-infringing. The entire
+ * risk as to the quality and performance of the covered code is with you. Should any covered
+ * code prove defective in any respect, you (not the initial developer or any other contributor)
+ * assume the cost of any necessary servicing, repair or correction. This disclaimer of warranty
+ * constitutes an essential part of this license. No use of any covered code is authorized hereunder
+ * except under this disclaimer. 
+ *
+ */
 
+#include "zap_dso.h"
+#include <stdlib.h>
+#include <string.h>
 
 /*
 ** {========================================================================
@@ -27,6 +30,7 @@
 ** =========================================================================
 */
 
+
 #include <dlfcn.h>
 
 void zap_dso_destroy(zap_dso_lib_t *lib) {
@@ -53,14 +57,14 @@ zap_func_ptr_t zap_dso_func_sym(zap_dso_lib_t lib, const char *sym, const char *
 }
 
 /* }====================================================== */
-
-/* For Emacs:
- * Local Variables:
- * mode:c
- * indent-tabs-mode:t
- * tab-width:4
- * c-basic-offset:4
- * End:
- * For VIM:
- * vim:set softtabstop=4 shiftwidth=4 tabstop=4
- */
+
+/* For Emacs:
+ * Local Variables:
+ * mode:c
+ * indent-tabs-mode:t
+ * tab-width:4
+ * c-basic-offset:4
+ * End:
+ * For VIM:
+ * vim:set softtabstop=4 shiftwidth=4 tabstop=4
+ */