diff --git a/src/acme.h b/src/acme.h
index 3296501..ab6bb77 100644
--- a/src/acme.h
+++ b/src/acme.h
@@ -12,8 +12,8 @@
 
 // Variables
 extern const char	*symbollist_filename;
-extern const char	*output_filename;
-extern const char	*report_filename;
+extern const char	*output_filename;	// TODO - put in "part" struct
+extern const char	*report_filename;	// TODO - put in "part" struct
 // maximum recursion depth for macro calls and "!source"
 extern signed long	macro_recursions_left;
 extern signed long	source_recursions_left;
diff --git a/src/encoding.h b/src/encoding.h
index 9fd0c92..64fd07d 100644
--- a/src/encoding.h
+++ b/src/encoding.h
@@ -8,7 +8,7 @@
 
 
 //struct encoder;
-extern const struct encoder	*encoder_current;	// gets set before each pass
+extern const struct encoder	*encoder_current;	// gets set before each pass	TODO - set for each part
 extern const struct encoder	encoder_raw;
 extern const struct encoder	encoder_pet;
 extern const struct encoder	encoder_scr;
diff --git a/src/global.h b/src/global.h
index 7fba4aa..7ec7f2d 100644
--- a/src/global.h
+++ b/src/global.h
@@ -59,7 +59,7 @@ extern const char	Byte_flags[];
 #define FOLLOWS_ANON	(1u << 3)	// preceding '-' are backward label
 // bits 2, 1 and 0 are currently unused
 
-
+// TODO - put in config/runtime structs:
 extern int	pass_count;
 extern int	Process_verbosity;	// Level of additional output
 extern int	warn_on_indented_labels;	// warn if indented label is encountered
@@ -86,7 +86,7 @@ struct report {
 	char		asc_buf[REPORT_ASCBUFSIZE];	// source bytes
 	char		bin_buf[REPORT_BINBUFSIZE];	// output bytes
 };
-extern struct report	*report;
+extern struct report	*report;	// TODO - put in "part" struct
 
 // Macros for skipping a single space character
 #define SKIPSPACE()		\