diff --git a/source3/include/libsmbclient.h b/source3/include/libsmbclient.h
--- a/source3/include/libsmbclient.h
+++ b/source3/include/libsmbclient.h
@@ -2781,9 +2781,6 @@ int smbc_unlink_print_job(const char *purl, int id);
  */
 int smbc_remove_unused_server(SMBCCTX * context, SMBCSRV * srv);
 
-#ifdef __cplusplus
-}
-#endif
 
 /**@ingroup directory
  * Convert strings of %xx to their single character equivalent.
@@ -2803,15 +2800,8 @@ int smbc_remove_unused_server(SMBCCTX * context, SMBCSRV * srv);
  * @return          The number of % sequences which could not be converted
  *                  due to lack of two following hexadecimal digits.
  */
-#ifdef __cplusplus
-extern "C" {
-#endif
 int
 smbc_urldecode(char *dest, char * src, size_t max_dest_len);
-#ifdef __cplusplus
-}
-#endif
-
 
 /*
  * Convert any characters not specifically allowed in a URL into their %xx
@@ -2830,15 +2820,8 @@ smbc_urldecode(char *dest, char * src, size_t max_dest_len);
  *
  * @returns         The remaining buffer length.
  */
-#ifdef __cplusplus
-extern "C" {
-#endif
 int
 smbc_urlencode(char * dest, char * src, int max_dest_len);
-#ifdef __cplusplus
-}
-#endif
-
 
 /**@ingroup directory
  * Return the version of the linked Samba code, and thus the version of the
@@ -2846,14 +2829,8 @@ smbc_urlencode(char * dest, char * src, int max_dest_len);
  *
  * @return          The version string.
  */
-#ifdef __cplusplus
-extern "C" {
-#endif
 const char *
 smbc_version(void);
-#ifdef __cplusplus
-}
-#endif
 
 /**@ingroup misc
  * Set the users credentials globally so they can be used for DFS
@@ -3232,4 +3209,9 @@ struct _SMBCCTX
 };
 
 
+#ifdef __cplusplus
+}
+#endif
+
+
 #endif /* SMBCLIENT_H_INCLUDED */