diff --git a/init.lua b/init.lua
index 4096322..dcfad18 100644
--- a/init.lua
+++ b/init.lua
@@ -27,6 +27,9 @@ require("options")
 require("bindings")
 require("pludin-dev")
 
+require("add-guard")
+require("cmacro-align")
+
 -- Misc features
 require("highlight-yank")
 
diff --git a/lua/add-guard.lua b/lua/add-guard.lua
new file mode 100644
index 0000000..642dd42
--- /dev/null
+++ b/lua/add-guard.lua
@@ -0,0 +1,32 @@
+
+vim.api.nvim_create_user_command("AddIncludeGuard", function(data)
+	local bufnr = vim.api.nvim_get_current_buf()
+	local name_pattern = data.fargs[1] or "%s_"
+
+	local function formatName(filename)
+		local parts = vim.split(filename, "[/\\]", {trimempty=true})
+		local last_part = parts[#parts]
+		local ext = last_part:match("%.([^%.]+)$")
+		local name = last_part:gsub("%.[^%.]+$", "")
+
+		if ext == "h" or ext == "hpp" then
+			name = name.."_H"
+		end
+
+		return name_pattern:format(name:upper())
+	end
+
+	local buf_filename = vim.api.nvim_buf_get_name(bufnr)
+	local guard_name = formatName(buf_filename)
+
+	vim.api.nvim_buf_set_lines(bufnr, 0, 0, false, {
+		"#ifndef "..guard_name,
+		"#define "..guard_name,
+		""
+	})
+
+	vim.api.nvim_buf_set_lines(bufnr, -1, -1, false, {
+		"",
+		"#endif //"..guard_name
+	})
+end, { nargs="?" })
diff --git a/lua/cmacro-align.lua b/lua/cmacro-align.lua
new file mode 100644
index 0000000..0623225
--- /dev/null
+++ b/lua/cmacro-align.lua
@@ -0,0 +1,72 @@
+local ts = vim.treesitter
+local query = ts.parse_query("c", "(preproc_function_def value: (preproc_arg) @macro_def)")
+
+local function get_ast_root(bufnr)
+	local tree = ts.get_parser(bufnr, "c"):parse()
+	return tree[1]:root()
+end
+
+
+local capture_lookup = {}
+for id, name in ipairs(query.captures) do
+	capture_lookup[name] = id
+end
+
+local function formatMacros()
+	local bufnr = vim.api.nvim_get_current_buf()
+	local winnr = vim.api.nvim_get_current_win()
+
+	for _, match in query:iter_matches(get_ast_root(bufnr), bufnr, 0, -1) do
+		local macro_def_node = match[capture_lookup.macro_def]
+		-- local class_name = ts.get_node_text(class_node, bufnr)
+		local start_line = macro_def_node:start()
+		local end_line = macro_def_node:end_()
+
+		local lines = vim.api.nvim_buf_get_lines(bufnr, start_line, end_line+1, false)
+		local tabstop = tonumber(vim.bo[bufnr].tabstop) or 8
+
+		for i, line in ipairs(lines) do
+			lines[i] = line:match("^(.-)%s*[\\]?$")
+		end
+
+		local line_length = 0
+		do
+			local textwidth  = vim.bo[bufnr].textwidth
+			if textwidth and textwidth ~= "" then
+				line_length = tonumber(textwidth)
+			end
+
+			if line_length <= 0 then
+				local colorcolum = vim.wo[winnr].colorcolumn
+				if colorcolum and colorcolum ~= "" then
+					line_length = tonumber(colorcolum)
+				end
+			end
+
+			if line_length <= 0 then
+				for _, line in ipairs(lines) do
+					line_length = math.max(line_length, #line+2)
+				end
+			end
+		end
+
+		for i = 1, #lines-1 do
+			local line = lines[i]
+			local length = #(line:gsub("\t", (" "):rep(tabstop)))
+			lines[i] = line .. (" "):rep(line_length - length-2) .. " \\"
+		end
+
+		vim.api.nvim_buf_set_lines(bufnr, start_line, end_line+1, false, lines)
+	end
+end
+
+local group = vim.api.nvim_create_augroup("UpdateCMacro", { clear = true })
+for _, cmd in ipairs{"InsertLeavePre", "BufWritePre"} do
+	vim.api.nvim_create_autocmd(cmd, {
+		group = group,
+		pattern = {"*.c", "*.h", "*.cpp", "*.hpp", "*.cc"},
+		callback = function (data)
+			formatMacros()
+		end
+	})
+end