diff --git a/apps/aqhome-nodes/0BUILD b/apps/aqhome-nodes/0BUILD
index b1f49a6..243ce46 100644
--- a/apps/aqhome-nodes/0BUILD
+++ b/apps/aqhome-nodes/0BUILD
@@ -44,6 +44,8 @@
       r_forward.h
       r_setaccmsggrps.h
       r_getnodes.h
+      server.h
+      server_p.h
     </headers>
   
     <sources>
diff --git a/apps/aqhome-react/0BUILD b/apps/aqhome-react/0BUILD
index 543ef81..397de10 100644
--- a/apps/aqhome-react/0BUILD
+++ b/apps/aqhome-react/0BUILD
@@ -103,6 +103,7 @@
 
     <headers dist="true" >
       server.h
+      server_p.h
       net_read.h
       suntimes.h
     </headers>
diff --git a/aqhome/ipc2/0BUILD b/aqhome/ipc2/0BUILD
index 3e70e87..f6c8144 100644
--- a/aqhome/ipc2/0BUILD
+++ b/aqhome/ipc2/0BUILD
@@ -50,12 +50,13 @@
       msgrequest.h
       msgreader.h
       msgwriter.h
-      ipcm_sgreader.h
+      ipc_endpoint.h
+      ipc_msgreader.h
+      ipc_server.h
+      ipc_client.h
       node_msgreader.h
       tcpd_object.h
       tcp_object.h
-      ipc_server.h
-      ipc_client.h
       tty_object.h
       tty_endpoint.h
       mqtt_msgreader.h
diff --git a/avr/modules/0BUILD b/avr/modules/0BUILD
index 95758dc..afc8cda 100644
--- a/avr/modules/0BUILD
+++ b/avr/modules/0BUILD
@@ -27,6 +27,7 @@
     network
     uart_bitbang
     uart_irq
+    uart_hw
     bootloader
   </subdirs>
 
diff --git a/avr/modules/network/0BUILD b/avr/modules/network/0BUILD
index e59ecc5..3588849 100644
--- a/avr/modules/network/0BUILD
+++ b/avr/modules/network/0BUILD
@@ -4,9 +4,17 @@
 
   <extradist>
     buffer.asm
+    data.asm
     defs.asm
+    iface.asm
+    main.asm
   </extradist>
 
+  <subdirs>
+    msg
+  </subdirs>
+  
+
 </gwbuild>
 
 
diff --git a/avr/modules/network/msg/0BUILD b/avr/modules/network/msg/0BUILD
index e71ddb7..b2deb75 100644
--- a/avr/modules/network/msg/0BUILD
+++ b/avr/modules/network/msg/0BUILD
@@ -3,7 +3,12 @@
 <gwbuild>
 
   <extradist>
+    common.asm
+    defs.asm
     device-w.asm
+    memstats-w.asm
+    recvstats-w.asm
+    sendstats-w.asm
   </extradist>
 
 </gwbuild>