diff --git a/event.c b/event.c
index aaee1185..f8bc5801 100644
--- a/event.c
+++ b/event.c
@@ -1773,9 +1773,11 @@ evthread_make_base_notifiable(struct event_base *base)
 
 	base->th_notify_fn = notify;
 
-	// This can't be right, can it?  We want writes to this socket to
-	// just succeed.
-	// evutil_make_socket_nonblocking(base->th_notify_fd[1]);
+	/*
+	  This can't be right, can it?  We want writes to this socket to
+	  just succeed.
+	  evutil_make_socket_nonblocking(base->th_notify_fd[1]);
+	*/
 
 	/* prepare an event that we can use for wakeup */
 	event_assign(&base->th_notify, base, base->th_notify_fd[0],
diff --git a/evutil.c b/evutil.c
index 5f8f9b9a..39495ec1 100644
--- a/evutil.c
+++ b/evutil.c
@@ -561,7 +561,7 @@ evutil_inet_pton(int af, const char *src, void *dst)
 		if (gapPos >= 0) {
 			int nToMove = setWords - (dot ? 2 : 0) - gapPos;
 			int gapLen = 8 - setWords;
-			// assert(nToMove >= 0);
+			/* assert(nToMove >= 0); */
 			if (nToMove < 0)
 				return -1; /* should be impossible */
 			memmove(&words[gapPos+gapLen], &words[gapPos],
diff --git a/sample/event-test.c b/sample/event-test.c
index f86cb62e..848cbc87 100644
--- a/sample/event-test.c
+++ b/sample/event-test.c
@@ -42,7 +42,7 @@ fifo_read(int fd, short event, void *arg)
 #ifdef WIN32
 	len = ReadFile((HANDLE)fd, buf, sizeof(buf) - 1, &dwBytesRead, NULL);
 
-	// Check for end of file.
+	/* Check for end of file. */
 	if(len && dwBytesRead == 0) {
 		fprintf(stderr, "End Of File");
 		event_del(ev);
@@ -72,14 +72,14 @@ main (int argc, char **argv)
 	struct event evfifo;
 #ifdef WIN32
 	HANDLE socket;
-	// Open a file.
-	socket = CreateFile("test.txt",     // open File
-			GENERIC_READ,                 // open for reading
-			0,                            // do not share
-			NULL,                         // no security
-			OPEN_EXISTING,                // existing file only
-			FILE_ATTRIBUTE_NORMAL,        // normal file
-			NULL);                        // no attr. template
+	/* Open a file. */
+	socket = CreateFile("test.txt",               /* open File */
+			GENERIC_READ,                 /* open for reading */
+			0,                            /* do not share */
+			NULL,                         /* no security */
+			OPEN_EXISTING,                /* existing file only */
+			FILE_ATTRIBUTE_NORMAL,        /* normal file */
+			NULL);                        /* no attr. template */
 
 	if(socket == INVALID_HANDLE_VALUE)
 		return 1;
diff --git a/test/regress_buffer.c b/test/regress_buffer.c
index 3bddacda..1d698290 100644
--- a/test/regress_buffer.c
+++ b/test/regress_buffer.c
@@ -1135,7 +1135,7 @@ test_evbuffer_freeze(void *ptr)
 	FREEZE_EQ(r, 0, -1);
 	r = evbuffer_add_printf(buf, "Hello %s", "world");
 	FREEZE_EQ(r, 11, -1);
-	// TODO: test add_buffer, add_file, read
+	/* TODO: test add_buffer, add_file, read */
 
 	if (!start)
 		tt_int_op(orig_length, ==, evbuffer_get_length(buf));
@@ -1153,7 +1153,7 @@ test_evbuffer_freeze(void *ptr)
 	FREEZE_EQ(cp==NULL, 1, 0);
 	if (cp)
 		free(cp);
-	// TODO: Test remove_buffer, add_buffer, write, prepend_buffer
+	/* TODO: Test remove_buffer, add_buffer, write, prepend_buffer */
 
 	if (start)
 		tt_int_op(orig_length, ==, evbuffer_get_length(buf));
diff --git a/test/regress_http.c b/test/regress_http.c
index a53b5cc2..daa03e94 100644
--- a/test/regress_http.c
+++ b/test/regress_http.c
@@ -1112,7 +1112,7 @@ http_put_cb(struct evhttp_request *req, void *arg)
 	if (EVBUFFER_LENGTH(req->input_buffer) != strlen(PUT_DATA)) {
 		fprintf(stdout, "FAILED (length: %zu vs %zu)\n",
 		    EVBUFFER_LENGTH(req->input_buffer), strlen(PUT_DATA));
-		//exit(1);
+		exit(1);
 	}
 
 	if (memcmp(EVBUFFER_DATA(req->input_buffer), PUT_DATA,
diff --git a/test/regress_main.c b/test/regress_main.c
index 1512f768..4ce699b2 100644
--- a/test/regress_main.c
+++ b/test/regress_main.c
@@ -150,7 +150,7 @@ basic_test_setup(const struct testcase_t *testcase)
         if (testcase->flags & TT_NEED_DNS) {
                 evdns_set_log_fn(dnslogcb);
                 if (evdns_init())
-                        return NULL; /* fast failure *//*XXX asserts. */
+                        return NULL; /* fast failure */ /*XXX asserts. */
         }
 
 	data = calloc(1, sizeof(*data));
diff --git a/test/tinytest.c b/test/tinytest.c
index 07483b8c..3654e681 100644
--- a/test/tinytest.c
+++ b/test/tinytest.c
@@ -102,7 +102,6 @@ _testcase_run_forked(const struct testgroup_t *group,
 	 */
 	int ok;
 	char buffer[LONGEST_TEST_NAME+256];
-	//const char *verbosity;
 	STARTUPINFO si;
 	PROCESS_INFORMATION info;
 	DWORD exitcode;