diff --git a/src/sratom.c b/src/sratom.c
index 0e61517..222d12c 100644
--- a/src/sratom.c
+++ b/src/sratom.c
@@ -14,17 +14,19 @@
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
-#include <assert.h>
-#include <ctype.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include "sratom/sratom.h"
 
+#include "lv2/atom/atom.h"
 #include "lv2/atom/forge.h"
 #include "lv2/atom/util.h"
 #include "lv2/midi/midi.h"
+#include "lv2/urid/urid.h"
 
-#include "sratom/sratom.h"
+#include <assert.h>
+#include <ctype.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 
 #define NS_RDF (const uint8_t*)"http://www.w3.org/1999/02/22-rdf-syntax-ns#"
 #define NS_XSD (const uint8_t*)"http://www.w3.org/2001/XMLSchema#"
diff --git a/tests/sratom_test.c b/tests/sratom_test.c
index 4af757d..1738e3d 100644
--- a/tests/sratom_test.c
+++ b/tests/sratom_test.c
@@ -14,16 +14,21 @@
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
-#include <ctype.h>
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
-
+#include "lv2/atom/atom.h"
 #include "lv2/atom/forge.h"
 #include "lv2/atom/util.h"
 #include "lv2/midi/midi.h"
+#include "lv2/urid/urid.h"
+#include "serd/serd.h"
 #include "sratom/sratom.h"
 
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
 #define NS_RDF "http://www.w3.org/1999/02/22-rdf-syntax-ns#"
 
 #define USTR(s) ((const uint8_t*)(s))