[dev][interrupt][arm_gic/x86_lapic]: Include missing dependencies
Include lk/macros.h directly so that we can remove
assert.h's dependence on debug.h.
We also include debug.h on local_apic.c in which
dprintf (defined in debug.h) is called.
Bug: 151183243
Change-Id: I9d2804faaea9815c276fddafba709f714a06fe06
diff --git a/dev/interrupt/arm_gic/gic_v3.c b/dev/interrupt/arm_gic/gic_v3.c
index c492de6..d5e3c66 100644
--- a/dev/interrupt/arm_gic/gic_v3.c
+++ b/dev/interrupt/arm_gic/gic_v3.c
@@ -24,6 +24,7 @@
#include <arch/ops.h>
#include <assert.h>
#include <bits.h>
+#include <lk/macros.h>
#include <stdint.h>
#include <dev/interrupt/arm_gic.h>
diff --git a/dev/interrupt/x86_lapic/local_apic.c b/dev/interrupt/x86_lapic/local_apic.c
index 2e1c6e9..8053dab 100644
--- a/dev/interrupt/x86_lapic/local_apic.c
+++ b/dev/interrupt/x86_lapic/local_apic.c
@@ -20,12 +20,14 @@
* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
-#include <assert.h>
#include <arch/x86.h>
#include <arch/x86/mmu.h>
#include <arch/arch_ops.h>
+#include <assert.h>
+#include <debug.h>
#include <dev/interrupt/local_apic.h>
#include <lk/init.h>
+#include <lk/macros.h>
#include <kernel/vm.h>
#include <reg.h>
