diff --git a/CREDITS b/CREDITS
index 4425f8e7..c85d3492 100644
--- a/CREDITS
+++ b/CREDITS
@@ -4,7 +4,7 @@ I've received lots of help from people on this project.
 
 These are the people who have contributed to whatever
 small success this project enjoys (in order of
-contribution)
+contribution).  If I've forgotten anyone, I apologize.
 
 Aubin Paul (debian@outlyer.org) 
  * Patches for Debian package generation
@@ -14,3 +14,15 @@ Paul Forgey (paulf@aphrodite.com)
  * Tons of troubleshooting on Solaris
  * Fixes for readdir_r
 
+Paul Hubbard (hubbard@mcs.anl.gov)
+ * T/S and patch testing to resolve scanning bugs
+
+David Buttrick (dbuttric@users.sourceforge.net)
+ * Webmastering, FAQ maintenance, Doc maintenance
+
+Hans-Christoph Steiner (eighthave@users.sourceforge.net)
+ * Webmastering, FAQ maintenance, Doc maintenance
+
+David Imhoff (6219@thrijswijk.nl)
+ * Code cleanup patches (_XOPEN_SOURCE, declaration problems)
+
diff --git a/src/configfile.c b/src/configfile.c
index 3b6588b8..57785152 100644
--- a/src/configfile.c
+++ b/src/configfile.c
@@ -127,11 +127,10 @@ int config_session=0;
 int config_read(char *file) {
     FILE *fin;
     char *buffer;
-    int err;
+    int err=0;
     char *value;
     char *comment;
     char path_buffer[PATH_MAX];
-    err=0;
     CONFIGELEMENT *pce;
     int handled;
 
diff --git a/src/db-memory.c b/src/db-memory.c
index aff1a372..9154de38 100644
--- a/src/db-memory.c
+++ b/src/db-memory.c
@@ -19,12 +19,11 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#define _XOPEN_SOURCE 600
+
 #include <errno.h>
 #include <stdio.h>
 #include <string.h>
-
-
-#define __USE_UNIX98
 #include <pthread.h>
 
 #include "err.h"
diff --git a/src/main.c b/src/main.c
index 68bf3c50..09a2882e 100644
--- a/src/main.c
+++ b/src/main.c
@@ -416,6 +416,7 @@ int main(int argc, char *argv[]) {
     WSHANDLE server;
     int parseonly=0;
     int foreground=0;
+
     config.use_mdns=1;
 
     fprintf(stderr,"mt-daapd: version %s\n",VERSION);
diff --git a/src/webserver.c b/src/webserver.c
index 468596b6..b323915a 100644
--- a/src/webserver.c
+++ b/src/webserver.c
@@ -918,9 +918,11 @@ int ws_testrequestheader(WS_CONNINFO *pwsc, char *header, char *value) {
  *
  */
 int ws_testarg(ARGLIST *root, char *key, char *value) {
+    char *retval;
+
     DPRINTF(ERR_DEBUG,"Checking to see if %s matches %s\n",key,value);
 
-    char *retval=ws_getarg(root,key);
+    retval=ws_getarg(root,key);
     if(!retval)
 	return 0;