diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index f54b62ec7..34fafe533 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,9 @@
+2005-09-27  Christopher Faylor  <cgf@timesys.com>
+
+	* init.cc (prime_threads): Make this static, as it should be.
+	(dll_entry): Apply cosmetic changes to define closer to the way MSDN
+	suggests.
+
 2005-09-27  Corinna Vinschen  <corinna@vinschen.de>
 
 	* pthread.cc (mangle_sem_name): Use cygheap->shared_prefix instead
diff --git a/winsup/cygwin/init.cc b/winsup/cygwin/init.cc
index 478d83105..96dda7c1e 100644
--- a/winsup/cygwin/init.cc
+++ b/winsup/cygwin/init.cc
@@ -47,7 +47,7 @@ calibration_thread (VOID *arg)
    When it starts, a call will be made to dll_entry which will call munge_threadfunc
    looking for the calibration thread offset on the stack.  This offset will
    be stored and used by all executing cygwin processes. */
-void
+static void
 prime_threads ()
 {
   if (!threadfunc_ix[0])
@@ -137,7 +137,7 @@ extern void __stdcall dll_crt0_0 ();
 
 HMODULE NO_COPY cygwin_hmodule;
 
-extern "C" int WINAPI
+extern "C" BOOL WINAPI
 dll_entry (HANDLE h, DWORD reason, void *static_load)
 {
   BOOL is_wow64_proc = FALSE;
@@ -173,5 +173,6 @@ dll_entry (HANDLE h, DWORD reason, void *static_load)
       _my_tls.remove (0);
       break;
     }
-  return 1;
+
+  return TRUE;
 }