diff --git a/winsup/cygwin/dll_init.sgml b/winsup/cygwin/dll_init.sgml
index 38070390c..2c37a22a7 100644
--- a/winsup/cygwin/dll_init.sgml
+++ b/winsup/cygwin/dll_init.sgml
@@ -3,9 +3,11 @@
 <title>cygwin_detach_dll</title>
 
 <funcsynopsis>
+<funcprototype>
 <funcdef>extern "C" void
 <function>cygwin_detach_dll</function></funcdef>
 <paramdef>int <parameter>dll_index</parameter></paramdef>
+</funcprototype>
 </funcsynopsis>
 
 </sect1>
diff --git a/winsup/cygwin/dtable.sgml b/winsup/cygwin/dtable.sgml
index 9f292ee73..5e807883b 100644
--- a/winsup/cygwin/dtable.sgml
+++ b/winsup/cygwin/dtable.sgml
@@ -3,6 +3,7 @@
 <title>cygwin_attach_handle_to_fd</title>
 
 <funcsynopsis>
+<funcprototype>
 <funcdef>extern "C" int
 <function>cygwin_attach_handle_to_fd</function></funcdef>
 <paramdef>char *<parameter>name</parameter></paramdef>
@@ -10,6 +11,7 @@
 <paramdef>HANDLE <parameter>handle</parameter></paramdef>
 <paramdef>int <parameter>bin</parameter></paramdef>
 <paramdef>int <parameter>access</parameter></paramdef>
+</funcprototype>
 </funcsynopsis>
 
 <para>This function can be used to turn a Win32 "handle" into a
diff --git a/winsup/cygwin/external.sgml b/winsup/cygwin/external.sgml
index 270eede4d..88d67252f 100644
--- a/winsup/cygwin/external.sgml
+++ b/winsup/cygwin/external.sgml
@@ -3,10 +3,12 @@
 <title>cygwin_internal</title>
 
 <funcsynopsis>
+<funcprototype>
 <funcdef>extern "C" DWORD
 <function>cygwin_internal</function></funcdef>
 <paramdef>cygwin_getinfo_types <parameter>t</parameter></paramdef>
 <paramdef><parameter>...</parameter></paramdef>
+</funcprototype>
 </funcsynopsis>
 
 <para>This function gives you access to various internal data and functions.
diff --git a/winsup/cygwin/path.sgml b/winsup/cygwin/path.sgml
index 6030c8f78..6638e92e5 100644
--- a/winsup/cygwin/path.sgml
+++ b/winsup/cygwin/path.sgml
@@ -2,10 +2,12 @@
 <title>cygwin_posix_to_win32_path_list</title>
 
 <funcsynopsis>
+<funcprototype>
 <funcdef>extern "C" void
 <function>cygwin_posix_to_win32_path_list</function></funcdef>
 <paramdef>const char *<parameter>posix</parameter></paramdef>
 <paramdef>char *<parameter>win32</parameter></paramdef>
+</funcprototype>
 </funcsynopsis>
 
 <para>Given a POSIX path-style string (i.e. /foo:/bar) convert it to
@@ -39,10 +41,12 @@ cygwin_posix_to_win32_path_list_buf_size</link></para>
 <title>cygwin_win32_to_posix_path_list</title>
 
 <funcsynopsis>
+<funcprototype>
 <funcdef>extern "C" void
 <function>cygwin_win32_to_posix_path_list</function></funcdef>
 <paramdef>const char *<parameter>win32</parameter></paramdef>
 <paramdef>char *<parameter>posix</parameter></paramdef>
+</funcprototype>
 </funcsynopsis>
 
 <para>Given a Win32 path-style string (i.e. d:\;e:\bar) convert it to
@@ -58,9 +62,11 @@ cygwin_win32_to_posix_path_list_buf_size</link></para>
 <title>cygwin_posix_to_win32_path_list_buf_size</title>
 
 <funcsynopsis>
+<funcprototype>
 <funcdef>extern "C" int
 <function>cygwin_posix_to_win32_path_list_buf_size</function></funcdef>
 <paramdef>const char *<parameter>path_list</parameter></paramdef>
+</funcprototype>
 </funcsynopsis>
 
 <para>Returns the number of bytes needed to hold the result of calling
@@ -73,9 +79,11 @@ cygwin_posix_to_win32_path_list</link>.</para>
 <title>cygwin_win32_to_posix_path_list_buf_size</title>
 
 <funcsynopsis>
+<funcprototype>
 <funcdef>extern "C" int
 <function>cygwin_win32_to_posix_path_list_buf_size</function></funcdef>
 <paramdef>const char *<parameter>path_list</parameter></paramdef>
+</funcprototype>
 </funcsynopsis>
 
 <para>Tells you how many bytes are needed for the results of <link
@@ -88,10 +96,12 @@ cygwin_win32_to_posix_path_list</link>.</para>
 <title>cygwin_conv_to_posix_path</title>
 
 <funcsynopsis>
+<funcprototype>
 <funcdef>extern "C" void
 <function>cygwin_conv_to_posix_path</function></funcdef>
 <paramdef>const char *<parameter>path</parameter></paramdef>
 <paramdef>char *<parameter>posix_path</parameter></paramdef>
+</funcprototype>
 </funcsynopsis>
 
 <para>Converts a Win32 path to a POSIX path.  If
@@ -107,10 +117,12 @@ size; use MAX_PATH if needed.</para>
 <title>cygwin_conv_to_win32_path</title>
 
 <funcsynopsis>
+<funcprototype>
 <funcdef>extern "C" void
 <function>cygwin_conv_to_win32_path</function></funcdef>
 <paramdef>const char *<parameter>path</parameter></paramdef>
 <paramdef>char *<parameter>win32_path</parameter></paramdef>
+</funcprototype>
 </funcsynopsis>
 
 <para>Converts a POSIX path to a Win32 path.  If
@@ -125,10 +137,12 @@ size; use MAX_PATH if needed.</para>
 <title>cygwin_conv_to_full_posix_path</title>
 
 <funcsynopsis>
+<funcprototype>
 <funcdef>extern "C" void
 <function>cygwin_conv_to_full_posix_path</function></funcdef>
 <paramdef>const char *<parameter>path</parameter></paramdef>
 <paramdef>char *<parameter>posix_path</parameter></paramdef>
+</funcprototype>
 </funcsynopsis>
 
 <para>Converts a Win32 path to a POSIX path.  If
@@ -144,10 +158,12 @@ buffer of sufficient size; use MAX_PATH if needed.</para>
 <title>cygwin_conv_to_full_win32_path</title>
 
 <funcsynopsis>
+<funcprototype>
 <funcdef>extern "C" void
 <function>cygwin_conv_to_full_win32_path</function></funcdef>
 <paramdef>const char *<parameter>path</parameter></paramdef>
 <paramdef>char *<parameter>win32_path</parameter></paramdef>
+</funcprototype>
 </funcsynopsis>
 
 <para>Converts a POSIX path to a Win32 path.  If
@@ -163,9 +179,11 @@ buffer of sufficient size; use MAX_PATH if needed.</para>
 <title>cygwin_posix_path_list_p</title>
 
 <funcsynopsis>
+<funcprototype>
 <funcdef>extern "C" int
 <function>posix_path_list_p</function></funcdef>
 <paramdef>const char *<parameter>path</parameter></paramdef>
+</funcprototype>
 </funcsynopsis>
 
 <para>This function tells you if the supplied
@@ -182,12 +200,14 @@ parameter.</para>
 <title>cygwin_split_path</title>
 
 <funcsynopsis>
+<funcprototype>
 <funcdef>extern "C" void
 <function>cygwin_split_path</function>
 </funcdef>
 <paramdef>const char * <parameter>path</parameter></paramdef>
 <paramdef>char * <parameter>dir</parameter></paramdef>
 <paramdef>char * <parameter>file</parameter></paramdef>
+</funcprototype>
 </funcsynopsis>
 
 <para>Split a path into the directory and the file portions.  Both
diff --git a/winsup/cygwin/pinfo.cc b/winsup/cygwin/pinfo.cc
index 834fa8574..2eca86a33 100644
--- a/winsup/cygwin/pinfo.cc
+++ b/winsup/cygwin/pinfo.cc
@@ -610,10 +610,12 @@ pinfo::release ()
   <title>cygwin_winpid_to_pid</title>
 
   <funcsynopsis>
+    <funcprototype>
     <funcdef>extern "C" pid_t
       <function>cygwin_winpid_to_pid</function>
       </funcdef>
       <paramdef>int <parameter>winpid</parameter></paramdef>
+    </funcprototype>
   </funcsynopsis>
 
   <para>Given a windows pid, converts to the corresponding Cygwin
diff --git a/winsup/cygwin/shared.sgml b/winsup/cygwin/shared.sgml
index f43d654e2..f06f065fa 100644
--- a/winsup/cygwin/shared.sgml
+++ b/winsup/cygwin/shared.sgml
@@ -3,9 +3,11 @@
 <title>cygwin_getshared</title>
 
 <funcsynopsis>
+<funcprototype>
 <funcdef>shared_info *
 <function>cygwin_getshared</function></funcdef>
 <void>
+</funcprototype>
 </funcsynopsis>
 
 <para>Returns a pointer to an internal Cygwin memory structure
diff --git a/winsup/cygwin/stackdump.sgml b/winsup/cygwin/stackdump.sgml
index bff76bffd..5c209541b 100644
--- a/winsup/cygwin/stackdump.sgml
+++ b/winsup/cygwin/stackdump.sgml
@@ -2,9 +2,11 @@
 <title>cygwin_stackdump</title>
 
 <funcsynopsis>
+<funcprototype>
 <funcdef>extern "C" void
 <function>cygwin_stackdump</function></funcdef>
 <void>
+</funcprototype>
 </funcsynopsis>
 
 <para> Outputs a stackdump to stderr from the called location.