diff --git a/src/cdogs/files.h b/src/cdogs/files.h
index 2a231df..b42ce0d 100644
--- a/src/cdogs/files.h
+++ b/src/cdogs/files.h
@@ -81,6 +81,8 @@ ssize_t f_read(FILE *f, void *buf, size_t size);
 ssize_t f_read32(FILE *f, void *buf, size_t size);
 ssize_t f_read16(FILE *f, void *buf, size_t size);
 
+#undef swap32
+#undef swap16
 void swap32 (void *d);
 void swap16 (void *d);
 
diff --git a/src/json/json.c b/src/json/json.c
index fb928d4..be53ea8 100644
--- a/src/json/json.c
+++ b/src/json/json.c
@@ -26,6 +26,7 @@
 #include <assert.h>
 #include <memory.h>
 #include <sys/types.h>
+#include <limits.h>
 
 
 enum LEX_VALUE