diff --git a/src/unity.c b/src/unity.c
index 244de46..dc2af66 100644
--- a/src/unity.c
+++ b/src/unity.c
@@ -1231,9 +1231,9 @@ void UnityIgnore(const char* msg, const UNITY_LINE_TYPE line)
     UNITY_WEAK_ATTRIBUTE void tearDown(void) { }
 #elif defined(UNITY_WEAK_PRAGMA)
 #   pragma weak setUp
-    void setUp(void);
+    void setUp(void) { }
 #   pragma weak tearDown
-    void tearDown(void);
+    void tearDown(void) { }
 #else
     void setUp(void);
     void tearDown(void);
diff --git a/src/unity.h b/src/unity.h
index da22820..342cb22 100644
--- a/src/unity.h
+++ b/src/unity.h
@@ -8,8 +8,16 @@
 #define UNITY_FRAMEWORK_H
 #define UNITY
 
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
 #include "unity_internals.h"
 
+void setUp(void);
+void tearDown(void);
+
 //-------------------------------------------------------
 // Configuration Options
 //-------------------------------------------------------
@@ -271,4 +279,7 @@
 #define TEST_ASSERT_DOUBLE_IS_NOT_DETERMINATE_MESSAGE(actual, message)                             UNITY_TEST_ASSERT_DOUBLE_IS_NOT_DETERMINATE((actual), __LINE__, (message))
 
 //end of UNITY_FRAMEWORK_H
+#ifdef __cplusplus
+}
+#endif
 #endif