diff --git a/src/include/c.h b/src/include/c.h
index d38788ec799b7666d3dc7a75bd7e0e81fcc5e0de..ca7ff8663a713354e31b129fb2df80467d1b5e4f 100644
--- a/src/include/c.h
+++ b/src/include/c.h
@@ -619,10 +619,6 @@ typedef NameData *Name;
 #define AssertState(condition) \
 		Trap(!(condition), "BadState")
 
-extern void ExceptionalCondition(const char *conditionName,
-					 const char *errorType,
-			 const char *fileName, int lineNumber) __attribute__((noreturn));
-
 #endif /* USE_ASSERT_CHECKING && !FRONTEND */
 
 
diff --git a/src/include/postgres.h b/src/include/postgres.h
index 9808bdca467338aa287ebc1f0ca0e86d2dac3344..f9c5527932e51fc6f6576f530e096ae70d5ca0d2 100644
--- a/src/include/postgres.h
+++ b/src/include/postgres.h
@@ -639,9 +639,15 @@ extern Datum Float8GetDatum(float8 X);
  */
 
 /*
- * This declaration supports the assertion-related macros in c.h.  This is here
- * because that file doesn't have PGDLLIMPORT in the right place.
+ * These declarations supports the assertion-related macros in c.h.
+ * assert_enabled is here because that file doesn't have PGDLLIMPORT in the
+ * right place, and ExceptionalCondition must be present, for the backend only,
+ * even when assertions are not enabled.
  */
 extern PGDLLIMPORT bool assert_enabled;
 
+extern void ExceptionalCondition(const char *conditionName,
+					 const char *errorType,
+			 const char *fileName, int lineNumber) __attribute__((noreturn));
+
 #endif   /* POSTGRES_H */