diff --git a/mxml.h b/mxml.h
index f5f0ebf..777d8df 100755
--- a/mxml.h
+++ b/mxml.h
@@ -58,6 +58,19 @@ typedef struct mxml_struct {
 
 /*------------------------------------------------------------------*/
 
+/* make functions callable from a C++ program */
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifndef EXPRT
+#if defined(EXPORT_DLL)
+#define EXPRT __declspec(dllexport)
+#else
+#define EXPRT
+#endif
+#endif
+
 MXML_WRITER *mxml_open_file(const char *file_name);
 MXML_WRITER *mxml_open_buffer(void); 
 int mxml_set_translate(MXML_WRITER *writer, int flag);
@@ -107,4 +120,9 @@ void mxml_free_tree(PMXML_NODE tree);
 
 void mxml_dirname(char* path);
 void mxml_basename(char *path);
+
+#ifdef __cplusplus
+}
+#endif
+
 /*------------------------------------------------------------------*/
diff --git a/strlcpy.h b/strlcpy.h
index bcdd1c2..4a2f285 100755
--- a/strlcpy.h
+++ b/strlcpy.h
@@ -5,10 +5,14 @@
 
    Contents:     Header file for strlcpy.c
 
-   $Id:$
+   $Id$
 
 \********************************************************************/
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #ifndef EXPRT
 #if defined(EXPORT_DLL)
 #define EXPRT __declspec(dllexport)
@@ -19,3 +23,7 @@
 
 size_t EXPRT strlcpy(char *dst, const char *src, size_t size);
 size_t EXPRT strlcat(char *dst, const char *src, size_t size);
+
+#ifdef __cplusplus
+}
+#endif