diff --git a/lib3270.cbp b/lib3270.cbp
index a4831e5..1616244 100644
--- a/lib3270.cbp
+++ b/lib3270.cbp
@@ -190,7 +190,6 @@
 		<Unit filename="src/include/ft_dftc.h" />
 		<Unit filename="src/include/ftc.h" />
 		<Unit filename="src/include/hostc.h" />
-		<Unit filename="src/include/keypadc.h" />
 		<Unit filename="src/include/kybdc.h" />
 		<Unit filename="src/include/lib3270-internals.h" />
 		<Unit filename="src/include/lib3270.h" />
diff --git a/src/include/lib3270.h b/src/include/lib3270.h
index e6c865a..1d8cab1 100644
--- a/src/include/lib3270.h
+++ b/src/include/lib3270.h
@@ -1389,6 +1389,9 @@
 	 */
 	LIB3270_EXPORT char * lib3270_build_data_filename(const char *name);
 
+	LIB3270_EXPORT void lib3270_set_session_id(H3270 *hSession, char id);
+	LIB3270_EXPORT char lib3270_get_session_id(H3270 *hSession);
+
 #ifdef __cplusplus
 	}
 #endif
diff --git a/src/include/lib3270/toggle.h b/src/include/lib3270/toggle.h
index 3935b14..f68b51f 100644
--- a/src/include/lib3270/toggle.h
+++ b/src/include/lib3270/toggle.h
@@ -33,6 +33,10 @@
 
 	#include <lib3270.h>
 
+#ifdef __cplusplus
+	extern "C" {
+#endif
+
 	/**
 	 * @brief get toggle state.
 	 *
@@ -109,10 +113,11 @@
 	 */
 	LIB3270_EXPORT int lib3270_toggle(H3270 *h, LIB3270_TOGGLE ix);
 
-	LIB3270_EXPORT void lib3270_set_session_id(H3270 *hSession, char id);
-	LIB3270_EXPORT char lib3270_get_session_id(H3270 *hSession);
-
 	LIB3270_EXPORT const void * lib3270_register_toggle_listener(H3270 *hSession, LIB3270_TOGGLE tx, void (*func)(H3270 *, LIB3270_TOGGLE, char, void *),void *data);
 	LIB3270_EXPORT int lib3270_unregister_toggle_listener(H3270 *hSession, LIB3270_TOGGLE tx, const void *id);
 
+#ifdef __cplusplus
+	}
+#endif
+
 #endif /* LIB3270_TOGGLE_H_INCLUDED */
--
libgit2 0.21.2