diff --git a/src/include/c.h b/src/include/c.h
index 7c5ac8642a..d38788ec79 100644
--- a/src/include/c.h
+++ b/src/include/c.h
@@ -582,7 +582,7 @@ typedef NameData *Name;
 #define AssertArg(condition) assert(condition)
 #define AssertState(condition) assert(condition)
 
-#else /* USE_ASSERT_CHECKING && FRONTEND */
+#else /* USE_ASSERT_CHECKING && !FRONTEND */
 
 /*
  * Trap
@@ -619,6 +619,10 @@ 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 207f7b8ffb..9808bdca46 100644
--- a/src/include/postgres.h
+++ b/src/include/postgres.h
@@ -638,10 +638,10 @@ 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.
+ */
 extern PGDLLIMPORT bool assert_enabled;
 
-extern void ExceptionalCondition(const char *conditionName,
-					 const char *errorType,
-			 const char *fileName, int lineNumber) __attribute__((noreturn));
-
 #endif   /* POSTGRES_H */