diff --git a/releasenotes.md b/releasenotes.md
index b7ba215aa..c0a2175ba 100644
--- a/releasenotes.md
+++ b/releasenotes.md
@@ -4,6 +4,7 @@
 
 ### Changes / improvements
 - Support `defer (catch err)`
+- Added `print-input` command argument to print all files used for compilation
 
 ### Fixes
 None
diff --git a/src/build/build.h b/src/build/build.h
index b1904d7a9..e87b915d8 100644
--- a/src/build/build.h
+++ b/src/build/build.h
@@ -360,6 +360,7 @@ typedef struct BuildOptions_
 	bool no_obj;
 	bool read_stdin;
 	bool print_output;
+	bool print_input;
 	const char *panicfn;
 	const char *benchfn;
 	const char *testfn;
@@ -462,6 +463,7 @@ typedef struct
 	bool testing;
 	bool read_stdin;
 	bool print_output;
+	bool print_input; 
 	bool print_linking;
 	bool no_entry;
 	int build_threads;
diff --git a/src/build/build_options.c b/src/build/build_options.c
index 4a4150a56..219c2e4ba 100644
--- a/src/build/build_options.c
+++ b/src/build/build_options.c
@@ -167,6 +167,7 @@ static void usage(void)
 	OUTPUT("  --list-type-properties     - List all type properties.");
 	OUTPUT("");
 	OUTPUT("  --print-output             - Print the object files created to stdout.");
+	OUTPUT("  --print-input              - Print inputted C3 files to stdout.");
 	OUTPUT("");
 	OUTPUT("  --winsdk <dir>             - Set the directory for Windows system library files for cross compilation.");
 	OUTPUT("  --wincrt=<option>          - Windows CRT linking: none, static, dynamic (default).");
@@ -885,6 +886,11 @@ static void parse_option(BuildOptions *options)
 				options->print_output = true;
 				return;
 			}
+			if (match_longopt("print-input"))
+			{
+				options->print_input = true; 
+				return;
+			}
 			if (match_longopt("no-entry"))
 			{
 				options->no_entry = true;
diff --git a/src/build/builder.c b/src/build/builder.c
index bcec43e57..40e7e5293 100644
--- a/src/build/builder.c
+++ b/src/build/builder.c
@@ -285,6 +285,7 @@ static void update_build_target_from_options(BuildTarget *target, BuildOptions *
 	if (options->emit_stdlib != EMIT_STDLIB_NOT_SET) target->emit_stdlib = options->emit_stdlib;
 	if (options->no_entry) target->no_entry = true;
 	target->print_output = options->print_output;
+	target->print_input = options->print_input;
 	target->emit_llvm = options->emit_llvm;
 	target->build_threads = options->build_threads;
 	target->emit_asm = options->emit_asm;
diff --git a/src/compiler/compiler.c b/src/compiler/compiler.c
index 0ea68c536..9af22d7c8 100644
--- a/src/compiler/compiler.c
+++ b/src/compiler/compiler.c
@@ -289,6 +289,10 @@ void compiler_parse(void)
 
 	// Load and parse all files.
 	bool has_error = false;
+	if (active_target.print_input)
+	{
+		puts("# input-files-begin");
+	}
 	VECEACH(global_context.sources, i)
 	{
 		bool loaded = false;
@@ -297,6 +301,11 @@ void compiler_parse(void)
 		if (!file) error_exit(error);
 		if (loaded) continue;
 		if (!parse_file(file)) has_error = true;
+		if (active_target.print_input) puts(file->full_path);
+	}
+	if (active_target.print_input)
+	{
+		puts("# input-files-end");
 	}
 	if (active_target.read_stdin)
 	{