diff --git a/dlls/kernel/tests/locale.c b/dlls/kernel/tests/locale.c
index 2e1c93bb291..778c0a2bb86 100644
--- a/dlls/kernel/tests/locale.c
+++ b/dlls/kernel/tests/locale.c
@@ -27,21 +27,18 @@
 #define eq(received, expected, label, type) \
         ok((received) == (expected), "%s: got " type " instead of " type, (label),(received),(expected))
 
-
-
 #define BUFFER_SIZE		50
-// Buffer used by callback function
+/* Buffer used by callback function */
 char GlobalBuffer[BUFFER_SIZE];
 
-// TODO :
-// Unicode versions
-// EnumTimeFormatsA
-// EnumDateFormatsA
-// LCMapStringA
-// GetUserDefaultLangID
-// ...
-
-
+/* TODO :
+ * Unicode versions
+ * EnumTimeFormatsA
+ * EnumDateFormatsA
+ * LCMapStringA
+ * GetUserDefaultLangID
+ * ...
+ */
 
 void TestGetLocaleInfoA()
 {
@@ -194,7 +191,9 @@ char buffer[BUFFER_SIZE], Expected[BUFFER_SIZE], format[BUFFER_SIZE];
 LCID lcid;
 
 	lcid = MAKELCID(MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US), SORT_DEFAULT );
-//	lcid = MAKELCID(MAKELANGID(LANG_FRENCH, SUBLANG_DEFAULT), SORT_DEFAULT );
+#if 0
+	lcid = MAKELCID(MAKELANGID(LANG_FRENCH, SUBLANG_DEFAULT), SORT_DEFAULT );
+#endif
 
 	memset( buffer, 'x', sizeof (buffer)/sizeof(buffer[0]) );
 	ret = GetCurrencyFormatA(lcid, 0, "23,65", NULL, buffer, sizeof(buffer));
@@ -277,7 +276,9 @@ BOOL CALLBACK EnumTimeFormatsProc(char * lpTimeFormatString)
 {
 	trace("%s\n", lpTimeFormatString);
 	strcpy(GlobalBuffer, lpTimeFormatString);
-//	return TRUE;
+#if 0
+	return TRUE;
+#endif
 	return FALSE;
 }
 
@@ -336,7 +337,9 @@ char buffer1[BUFFER_SIZE], buffer2[BUFFER_SIZE];
 
 START_TEST(locale)
 {
-//	TestEnumTimeFormats();
+#if 0
+	TestEnumTimeFormats();
+#endif
 	TestGetLocaleInfoA();
 	TestGetTimeFormatA();
 	TestGetDateFormatA();
diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c
index a4aefea9a32..c5e94cbc707 100644
--- a/dlls/setupapi/devinst.c
+++ b/dlls/setupapi/devinst.c
@@ -44,6 +44,9 @@ RETERR16 WINAPI DiGetClassDevs16(LPLPDEVICE_INFO16 lplpdi,
     return OK;
 }
 
+/***********************************************************************
+ *		SetupDiGetDeviceInterfaceDetailA (SETUPAPI.@)
+ */
 BOOL WINAPI SetupDiGetDeviceInterfaceDetailA(
       HDEVINFO DeviceInfoSet,
       PSP_DEVICE_INTERFACE_DATA DeviceInterfaceData,
@@ -56,6 +59,9 @@ BOOL WINAPI SetupDiGetDeviceInterfaceDetailA(
     return FALSE;
 }
 
+/***********************************************************************
+ *		SetupDiGetDeviceInterfaceDetailW (SETUPAPI.@)
+ */
 BOOL WINAPI SetupDiGetDeviceInterfaceDetailW(
       HDEVINFO DeviceInfoSet,
       PSP_DEVICE_INTERFACE_DATA DeviceInterfaceData,
@@ -68,6 +74,9 @@ BOOL WINAPI SetupDiGetDeviceInterfaceDetailW(
     return FALSE;
 }
 
+/***********************************************************************
+ *		SetupDiEnumDeviceInterfaces (SETUPAPI.@)
+ */
 BOOL WINAPI SetupDiEnumDeviceInterfaces(
        HDEVINFO DeviceInfoSet,
        PSP_DEVINFO_DATA DeviceInfoData,
@@ -79,6 +88,9 @@ BOOL WINAPI SetupDiEnumDeviceInterfaces(
     return FALSE;
 }
 
+/***********************************************************************
+ *		SetupDiGetClassDevsA (SETUPAPI.@)
+ */
 HDEVINFO WINAPI SetupDiGetClassDevsA(
        CONST GUID *class,
        LPCSTR enumstr,
@@ -90,6 +102,9 @@ HDEVINFO WINAPI SetupDiGetClassDevsA(
     return NULL;
 }
 
+/***********************************************************************
+ *		SetupDiEnumDeviceInfo (SETUPAPI.@)
+ */
 BOOL WINAPI SetupDiEnumDeviceInfo(
         HDEVINFO  devinfo,
         DWORD  index,
@@ -105,12 +120,18 @@ BOOL WINAPI SetupDiEnumDeviceInfo(
     return FALSE;
 }
 
+/***********************************************************************
+ *		SetupDiDestroyDeviceInfoList (SETUPAPI.@)
+ */
 BOOL WINAPI SetupDiDestroyDeviceInfoList( HDEVINFO devinfo )
 {
     FIXME("%04lx\n", (DWORD)devinfo);
     return FALSE;
 }
 
+/***********************************************************************
+ *		SetupDiGetDeviceRegistryPropertyA (SETUPAPI.@)
+ */
 BOOL WINAPI SetupDiGetDeviceRegistryPropertyA(
         HDEVINFO  devinfo,
         PSP_DEVINFO_DATA  DeviceInfoData,
diff --git a/scheduler/process.c b/scheduler/process.c
index c0b58ae0673..119cf9edb68 100644
--- a/scheduler/process.c
+++ b/scheduler/process.c
@@ -1774,10 +1774,7 @@ BOOL WINAPI AreFileApisANSI(void)
 
 
 /***********************************************************************
- *           GetTickCount       (USER.13)
- *           GetCurrentTime     (USER.15)
  *           GetTickCount       (KERNEL32.@)
- *           GetSystemMSecCount (SYSTEM.6)
  *
  * Returns the number of milliseconds, modulo 2^32, since the start
  * of the wineserver.