diff --git a/.ccls b/.ccls
index a953e9cf..a799f320 100644
--- a/.ccls
+++ b/.ccls
@@ -4,7 +4,6 @@ clang
 -Isrc
 -Ilib
 -DLIBDIR="/usr/local/lib"
--DINCLUDEDIR="/usr/local/include"
 -DLOCALEDIR="/usr/local/share/locale"
 -DMAKE_MAINTAINER_MODE
 -pthread
@@ -13,7 +12,6 @@ clang
 -Wall
 -Wextra
 -Werror
--Wno-address
 -Wwrite-strings
 -Wshadow
 -Wdeclaration-after-statement
@@ -26,3 +24,5 @@ clang
 -Wignored-qualifiers
 -Wformat-signedness
 -Wduplicated-cond
+-Wno-address
+-Wno-string-compare
diff --git a/.clangd b/.clangd
new file mode 100644
index 00000000..7b551470
--- /dev/null
+++ b/.clangd
@@ -0,0 +1,14 @@
+CompileFlags:
+  Add: [-xc, -DHAVE_CONFIG_H, -DMAKE_MAINTAINER_MODE, -DLIBDIR="/usr/local/lib", -DLOCALEDIR="/usr/local/share/locale", -I../src, -Isrc, -I../lib, -Ilib, -Wall, -Wextra, -Wwrite-strings, -Wshadow, -Wdeclaration-after-statement, -Wbad-function-cast, -Wformat-security, -Wtype-limits, -Wunused-but-set-parameter, -Wlogical-op, -Wpointer-arith, -Wignored-qualifiers, -Wformat-signedness, -Wduplicated-cond, -Wno-string-compare, -Wno-unused-includes]
+
+---
+If:
+  PathMatch: .*\.h
+CompileFlags:
+  Add: [-xc-header, --include=makeint.h]
+
+---
+If:
+  PathMatch: .*/makeint\.h
+Diagnostics:
+  UnusedIncludes: None