diff --git a/src/Brofiler.h b/src/Brofiler.h
index ee8d528baf..0587d6e5c6 100644
--- a/src/Brofiler.h
+++ b/src/Brofiler.h
@@ -56,7 +56,12 @@ private:
 	 * Indicates whether new statments will not be considered as part of
 	 * coverage statistics because it was marked with the @no-test tag.
 	 */
-	unsigned int ignoring;
+	uint32_t ignoring;
+
+	/**
+	 * The character to use to delimit Brofiler output files.  Default is '\t'.
+	 */
+	char delim;
 
 	/**
 	 * This maps Stmt location-desc pairs to the total number of times that
@@ -66,11 +71,6 @@ private:
 	 */
 	map<pair<string, string>, uint64_t> usage_map;
 
-	/**
-	 * The character to use to delimit Brofiler output files.  Default is '\t'.
-	 */
-	char delim;
-
 	/**
 	 * A canonicalization routine for Stmt descriptions containing characters
 	 * that don't agree with the output format of Brofiler.
diff --git a/src/DNS_Mgr.h b/src/DNS_Mgr.h
index 8155375e2d..f82b4cfa77 100644
--- a/src/DNS_Mgr.h
+++ b/src/DNS_Mgr.h
@@ -163,11 +163,11 @@ protected:
 
 	struct AsyncRequest {
 		double time;
-		bool is_txt;
-		bool processed;
 		IPAddr host;
 		string name;
 		CallbackList callbacks;
+		bool is_txt;
+		bool processed;
 
 		AsyncRequest() : time(0.0), is_txt(false), processed(false) { }
 
diff --git a/src/DbgBreakpoint.h b/src/DbgBreakpoint.h
index e27fabe2c1..ae86e83b69 100644
--- a/src/DbgBreakpoint.h
+++ b/src/DbgBreakpoint.h
@@ -63,21 +63,21 @@ protected:
 	void PrintHitMsg();	// display reason when the breakpoint hits
 
 	Kind kind;
-	bool enabled;	// ### comment this and next
-	bool temporary;
-	int BPID;
+	int32_t BPID;
 
 	char description[512];
 	string function_name;	// location
 	const char* source_filename;
-	int source_line;
+	int32_t source_line;
+	bool enabled;	// ### comment this and next
+	bool temporary;
 
 	Stmt* at_stmt;
 	double at_time;	// break when the virtual time is this
 
 	// Support for conditional and N'th time breakpoints.
-	int repeat_count;	// if positive, break after this many hits
-	int hit_count;	// how many times it's been hit (w/o breaking)
+	int32_t repeat_count;	// if positive, break after this many hits
+	int32_t hit_count;	// how many times it's been hit (w/o breaking)
 
 	string condition;	// condition to evaluate; nil for none
 };
diff --git a/src/Debug.h b/src/Debug.h
index 676c587635..ae3114ebc4 100644
--- a/src/Debug.h
+++ b/src/Debug.h
@@ -18,9 +18,9 @@ class Stmt;
 enum ParseLocationRecType { plrUnknown, plrFileAndLine, plrFunction };
 struct ParseLocationRec {
 	ParseLocationRecType type;
+	int32_t line;
 	Stmt* stmt;
 	const char* filename;
-	int line;
 };
 
 class StmtLocMapping;
diff --git a/src/DebugCmds.h b/src/DebugCmds.h
index 470e4ae993..2e4e424888 100644
--- a/src/DebugCmds.h
+++ b/src/DebugCmds.h
@@ -30,14 +30,13 @@ public:
 protected:
 	DebugCmd cmd;
 
-	int num_names;
+	int32_t num_names;
 	std::vector<const char*> names;
+	const char* const helpstring;
 
 	// Whether executing this should restart execution of the script.
 	bool resume_execution;
 
-	const char* const helpstring;
-
 	// Does entering a blank line repeat this command?
 	bool repeatable;
 };
diff --git a/src/Desc.h b/src/Desc.h
index 2a29c75a92..bbb365abd5 100644
--- a/src/Desc.h
+++ b/src/Desc.h
@@ -190,15 +190,17 @@ protected:
 
 	bool utf8; // whether valid utf-8 sequences may pass through unescaped
 	bool escape;	// escape unprintable characters in output?
-	typedef std::set<std::string> escape_set;
+	bool is_short;
+	bool want_quotes;
+
+	int indent_with_spaces;
+
+	using escape_set = std::set<std::string>;
 	escape_set escape_sequences; // additional sequences of chars to escape
 
 	BroFile* f;	// or the file we're using.
 
 	int indent_level;
-	int indent_with_spaces;
-	bool is_short;
-	bool want_quotes;
 	bool do_flush;
 	bool include_stats;
 
diff --git a/src/Dict.h b/src/Dict.h
index b5edeba76b..48e538c3af 100644
--- a/src/Dict.h
+++ b/src/Dict.h
@@ -162,17 +162,18 @@ private:
 	int num_buckets = 0;
 	int num_entries = 0;
 	int max_num_entries = 0;
+	int thresh_entries = 0;
 	uint64_t cumulative_entries = 0;
 	double den_thresh = 0.0;
-	int thresh_entries = 0;
 
 	// Resizing table (replicates tbl above).
 	PList<DictEntry>** tbl2 = nullptr;
 	int num_buckets2 = 0;
 	int num_entries2 = 0;
 	int max_num_entries2 = 0;
-	double den_thresh2 = 0;
+
 	int thresh_entries2 = 0;
+	double den_thresh2 = 0;
 
 	hash_t tbl_next_ind = 0;
 
diff --git a/src/Frag.h b/src/Frag.h
index 31d5ec5bd0..a7cf5a60ec 100644
--- a/src/Frag.h
+++ b/src/Frag.h
@@ -44,11 +44,11 @@ protected:
 
 	u_char* proto_hdr;
 	IP_Hdr* reassembled_pkt;
-	uint16_t proto_hdr_len;
 	NetSessions* s;
 	uint64_t frag_size;	// size of fully reassembled fragment
-	uint16_t next_proto; // first IPv6 fragment header's next proto field
 	FragReassemblerKey key;
+	uint16_t next_proto; // first IPv6 fragment header's next proto field
+	uint16_t proto_hdr_len;
 
 	FragTimer* expire_timer;
 };
diff --git a/src/Frame.h b/src/Frame.h
index 0961290ab1..6df91b7afa 100644
--- a/src/Frame.h
+++ b/src/Frame.h
@@ -261,6 +261,11 @@ private:
 	/** The number of vals that can be stored in this frame. */
 	int size;
 
+	bool weak_closure_ref = false;
+	bool break_before_next_stmt;
+	bool break_on_return;
+	bool delayed;
+
 	/** Associates ID's offsets with values. */
 	Val** frame;
 
@@ -270,7 +275,6 @@ private:
 
 	/** The enclosing frame of this frame. */
 	Frame* closure;
-	bool weak_closure_ref = false;
 
 	/** ID's used in this frame from the enclosing frame. */
 	id_list outer_ids;
@@ -289,12 +293,8 @@ private:
 	/** The next statement to be evaluted in the context of this frame. */
 	Stmt* next_stmt;
 
-	bool break_before_next_stmt;
-	bool break_on_return;
-
 	IntrusivePtr<trigger::Trigger> trigger;
 	const CallExpr* call;
-	bool delayed;
 
 	std::vector<BroFunc*> functions_with_closure_frame_reference;
 };
diff --git a/src/Func.h b/src/Func.h
index c414e3ac85..ac707fcb52 100644
--- a/src/Func.h
+++ b/src/Func.h
@@ -111,9 +111,9 @@ protected:
 	vector<Body> bodies;
 	IntrusivePtr<Scope> scope;
 	Kind kind;
+	uint32_t unique_id;
 	IntrusivePtr<BroType> type;
 	string name;
-	uint32_t unique_id;
 	static vector<Func*> unique_ids;
 };
 
diff --git a/src/ID.h b/src/ID.h
index ee96ea7845..9f56b1c20e 100644
--- a/src/ID.h
+++ b/src/ID.h
@@ -122,6 +122,8 @@ protected:
 	const char* name;
 	IDScope scope;
 	bool is_export;
+	bool infer_return_type;
+	bool weak_ref;
 	IntrusivePtr<BroType> type;
 	bool is_const, is_enum_const, is_type, is_option;
 	int offset;
@@ -130,6 +132,4 @@ protected:
 	// contains list of functions that are called when an option changes
 	std::multimap<int, IntrusivePtr<Func>> option_handlers;
 
-	bool infer_return_type;
-	bool weak_ref;
 };
diff --git a/src/Net.h b/src/Net.h
index e7b7f3bd7f..8dd643c399 100644
--- a/src/Net.h
+++ b/src/Net.h
@@ -93,17 +93,18 @@ struct ScannedFile {
 	dev_t dev;
 	ino_t inode;
 	int include_level;
-	string name;
 	bool skipped;		// This ScannedFile was @unload'd.
 	bool prefixes_checked;	// If loading prefixes for this file has been tried.
+	string name;
 
 	ScannedFile(dev_t arg_dev, ino_t arg_inode, int arg_include_level,
 	            const string& arg_name, bool arg_skipped = false,
 	            bool arg_prefixes_checked = false)
 		: dev(arg_dev), inode(arg_inode),
 		  include_level(arg_include_level),
-		  name(arg_name), skipped(arg_skipped),
-		  prefixes_checked(arg_prefixes_checked)
+		  skipped(arg_skipped),
+		  prefixes_checked(arg_prefixes_checked),
+		  name(arg_name)
 		{ }
 };
 
diff --git a/src/RuleMatcher.h b/src/RuleMatcher.h
index 0650081000..d5f958c2a5 100644
--- a/src/RuleMatcher.h
+++ b/src/RuleMatcher.h
@@ -102,6 +102,7 @@ private:
 
 	uint32_t id;	// For debugging, each HdrTest gets an unique ID
 	static uint32_t idcounter;
+	int32_t level;	// level within the tree
 
 	// The following are all set by RuleMatcher::BuildRulesTree().
 	friend class RuleMatcher;
@@ -132,8 +133,6 @@ private:
 
 	RuleHdrTest* sibling;	// linkage within HdrTest tree
 	RuleHdrTest* child;
-
-	int level;	// level within the tree
 };
 
 typedef PList<RuleHdrTest> rule_hdr_test_list;
@@ -173,7 +172,6 @@ private:
 
 	typedef PList<Matcher> matcher_list;
 
-	bool is_orig;
 	analyzer::Analyzer* analyzer;
 	RuleEndpointState* opposite;
 	analyzer::pia::PIA* pia;
@@ -188,6 +186,7 @@ private:
 	bstr_list matched_text;
 
 	int payload_size;
+	bool is_orig;
 
 	int_list matched_rules;		// Rules for which all conditions have matched
 };
diff --git a/src/Val.h b/src/Val.h
index 96b610892d..2f33c4b60e 100644
--- a/src/Val.h
+++ b/src/Val.h
@@ -691,7 +691,7 @@ class CompositeHash;
 class HashKey;
 class Frame;
 
-class TableVal : public Val, public notifier::Modifiable {
+class TableVal final : public Val, public notifier::Modifiable {
 public:
 	explicit TableVal(IntrusivePtr<TableType> t, IntrusivePtr<Attributes> attrs = nullptr);
 	~TableVal() override;
diff --git a/src/nb_dns.c b/src/nb_dns.c
index 106740bb61..7cc6e80a19 100644
--- a/src/nb_dns.c
+++ b/src/nb_dns.c
@@ -61,10 +61,10 @@ extern int recvfrom(int, void *, int, int, struct sockaddr *, int *);
 struct nb_dns_entry {
 	struct nb_dns_entry *next;
 	char name[NS_MAXDNAME + 1];
+	u_short id;
 	int qtype;			/* query type */
 	int atype;			/* address family */
 	int asize;			/* address size */
-	u_short id;
 	void *cookie;
 };
 
diff --git a/src/nb_dns.h b/src/nb_dns.h
index 3505239f91..1b96a8d426 100644
--- a/src/nb_dns.h
+++ b/src/nb_dns.h
@@ -11,8 +11,8 @@ struct nb_dns_info;
 struct nb_dns_result {
 	void *cookie;
 	int host_errno;
-	struct hostent *hostent;
 	uint32_t ttl;
+	struct hostent *hostent;
 };
 
 typedef unsigned int nb_uint32_t;