diff --git a/src/include/switch_cpp.h b/src/include/switch_cpp.h
index fb42b7cb57..485c6152a2 100644
--- a/src/include/switch_cpp.h
+++ b/src/include/switch_cpp.h
@@ -99,8 +99,8 @@ class API {
  public:
 	SWITCH_DECLARE_CONSTRUCTOR API(void);
 	virtual SWITCH_DECLARE_CONSTRUCTOR ~API();
-	SWITCH_DECLARE(char *) execute(const char *command, const char *data);
-	SWITCH_DECLARE(char *) executeString(const char *command);
+	SWITCH_DECLARE(const char *) execute(const char *command, const char *data);
+	SWITCH_DECLARE(const char *) executeString(const char *command);
 };
 
 
@@ -144,7 +144,7 @@ class Event {
 	virtual SWITCH_DECLARE_CONSTRUCTOR ~Event();
 	SWITCH_DECLARE(const char *)serialize(const char *format=NULL);
 	SWITCH_DECLARE(bool) setPriority(switch_priority_t priority = SWITCH_PRIORITY_NORMAL);
-	SWITCH_DECLARE(char *)getHeader(char *header_name);
+	SWITCH_DECLARE(const char *)getHeader(char *header_name);
 	SWITCH_DECLARE(char *)getBody(void);
 	SWITCH_DECLARE(const char *)getType(void);
 	SWITCH_DECLARE(bool) addBody(const char *value);
diff --git a/src/switch_cpp.cpp b/src/switch_cpp.cpp
index 3b5b07db65..7a98bafc86 100644
--- a/src/switch_cpp.cpp
+++ b/src/switch_cpp.cpp
@@ -104,7 +104,7 @@ SWITCH_DECLARE_CONSTRUCTOR API::~API()
 }
 
 
-SWITCH_DECLARE(char *) API::execute(const char *cmd, const char *arg)
+SWITCH_DECLARE(const char *) API::execute(const char *cmd, const char *arg)
 {
 	switch_stream_handle_t stream = { 0 };
 	this_check("");
@@ -114,7 +114,7 @@ SWITCH_DECLARE(char *) API::execute(const char *cmd, const char *arg)
 	return last_data;
 }
 
-SWITCH_DECLARE(char *) API::executeString(const char *cmd)
+SWITCH_DECLARE(const char *) API::executeString(const char *cmd)
 {
 	char *arg;
 	switch_stream_handle_t stream = { 0 };
@@ -238,7 +238,7 @@ SWITCH_DECLARE(bool) Event::setPriority(switch_priority_t priority)
 	return false;
 }
 
-SWITCH_DECLARE(char *)Event::getHeader(char *header_name)
+SWITCH_DECLARE(const char *)Event::getHeader(char *header_name)
 {
 	this_check("");