diff --git a/src/lam/util/argv.h b/src/lam/util/argv.h
index d1066f86ad..376f64c334 100644
--- a/src/lam/util/argv.h
+++ b/src/lam/util/argv.h
@@ -5,12 +5,18 @@
 #ifndef LAM_ARGV_H
 #define LAM_ARGV_H
 
-int lam_argv_add(int *argc, char ***argv, char *arg);
-void lam_argv_free(char **argv);
-char **lam_argv_split(char *src_string, int delimiter);
-int lam_argv_count(char **argv);
-char *lam_argv_join(char **argv, int delimiter);
-size_t lam_argv_len(char **argv);
-char **lam_argv_copy(char **argv);
+#ifdef __cplusplus
+extern "C" {
+#endif
+  int lam_argv_add(int *argc, char ***argv, char *arg);
+  void lam_argv_free(char **argv);
+  char **lam_argv_split(char *src_string, int delimiter);
+  int lam_argv_count(char **argv);
+  char *lam_argv_join(char **argv, int delimiter);
+  size_t lam_argv_len(char **argv);
+  char **lam_argv_copy(char **argv);
+#ifdef __cplusplus
+}
+#endif
 
 #endif /* LAM_ARGV_H */