diff --git a/src/clang_parser.cpp b/src/clang_parser.cpp
index c8dde4948d2..6b9a61ea427 100644
--- a/src/clang_parser.cpp
+++ b/src/clang_parser.cpp
@@ -1,11 +1,9 @@
-#include <clang-c/Index.h>
 #include <iostream>
 #include <string.h>
 
 #include "llvm/Config/llvm-config.h"
 
 #include "ast.h"
-#include "bpftrace.h"
 #include "clang_parser.h"
 #include "types.h"
 #include "utils.h"
diff --git a/src/clang_parser.h b/src/clang_parser.h
index 7f9df4a2408..59087481d7c 100644
--- a/src/clang_parser.h
+++ b/src/clang_parser.h
@@ -1,16 +1,12 @@
 #pragma once
 
 #include <clang-c/Index.h>
-
-#include "struct.h"
 #include "bpftrace.h"
 
 namespace bpftrace {
 
 namespace ast { class Program; }
 
-using StructMap = std::map<std::string, Struct>;
-
 class ClangParser
 {
 public:
diff --git a/tests/clang_parser.cpp b/tests/clang_parser.cpp
index 1085142c51b..33e0cc98315 100644
--- a/tests/clang_parser.cpp
+++ b/tests/clang_parser.cpp
@@ -2,11 +2,14 @@
 #include "clang_parser.h"
 #include "driver.h"
 #include "bpftrace.h"
+#include "struct.h"
 
 namespace bpftrace {
 namespace test {
 namespace clang_parser {
 
+using StructMap = std::map<std::string, Struct>;
+
 static void parse(const std::string &input, BPFtrace &bpftrace, bool result = true)
 {
   auto extended_input = input + "kprobe:sys_read { 1 }";