diff --git a/sc2/src/sc2code/comm/druuge/druugec.c b/sc2/src/sc2code/comm/druuge/druugec.c
index 0778f489b..b23094abe 100644
--- a/sc2/src/sc2code/comm/druuge/druugec.c
+++ b/sc2/src/sc2code/comm/druuge/druugec.c
@@ -135,8 +135,7 @@ static LOCDATA druuge_desc =
 static COUNT SlaveryCount = 0;
 
 static void
-ExitConversation (Response)
-RESPONSE_REF Response;
+ExitConversation (RESPONSE_REF Response)
 {
 	if (PLAYER_SAID (Response, bye))
 	{
diff --git a/sc2/src/sc2code/comm/ilwrath/ilwrathc.c b/sc2/src/sc2code/comm/ilwrath/ilwrathc.c
index a3df4e064..b13ab1382 100644
--- a/sc2/src/sc2code/comm/ilwrath/ilwrathc.c
+++ b/sc2/src/sc2code/comm/ilwrath/ilwrathc.c
@@ -83,8 +83,7 @@ static LOCDATA ilwrath_desc =
 };
 
 static void
-CombatIsInevitable (Response)
-RESPONSE_REF Response;
+CombatIsInevitable (RESPONSE_REF Response)
 {
 	SET_GAME_STATE (BATTLE_SEGUE, 1);
 
diff --git a/sc2/src/sc2code/comm/spathi/spathic.c b/sc2/src/sc2code/comm/spathi/spathic.c
index b4194793e..d85c0cd62 100644
--- a/sc2/src/sc2code/comm/spathi/spathic.c
+++ b/sc2/src/sc2code/comm/spathi/spathic.c
@@ -129,8 +129,7 @@ static LOCDATA spathi_desc =
 };
 
 static void
-ExitConversation (Response)
-RESPONSE_REF Response;
+ExitConversation (RESPONSE_REF Response)
 {
 	SET_GAME_STATE (BATTLE_SEGUE, 0);
 
diff --git a/sc2/src/sc2code/comm/starbas/starbas.c b/sc2/src/sc2code/comm/starbas/starbas.c
index b19e153d1..d735031cb 100644
--- a/sc2/src/sc2code/comm/starbas/starbas.c
+++ b/sc2/src/sc2code/comm/starbas/starbas.c
@@ -136,8 +136,7 @@ static LOCDATA commander_desc =
 static DWORD CurBulletinMask;
 
 static void
-ByeBye (R)
-RESPONSE_REF R;
+ByeBye (RESPONSE_REF R)
 {
 	BYTE b0, b1, b2, b3;
 
diff --git a/sc2/src/sc2code/commglue.c b/sc2/src/sc2code/commglue.c
index 26dd67f94..b6ee9d8b8 100644
--- a/sc2/src/sc2code/commglue.c
+++ b/sc2/src/sc2code/commglue.c
@@ -25,7 +25,7 @@
 int NPCNumberPhrase (int number, UNICODE **ptrack);
 
 void
-NPCPhrase_cb (int index,  void (*cb) ())
+NPCPhrase_cb (int index,  void (*cb) (void))
 {
 	UNICODE *pStr, numbuf[100];
 	void *pClip, *pTimeStamp;
diff --git a/sc2/src/sc2code/commglue.h b/sc2/src/sc2code/commglue.h
index eea845c58..429951ac2 100644
--- a/sc2/src/sc2code/commglue.h
+++ b/sc2/src/sc2code/commglue.h
@@ -55,7 +55,7 @@ extern void DoResponsePhrase (RESPONSE_REF R, RESPONSE_FUNC
 		response_func, UNICODE *ContstructStr);
 extern void DoNPCPhrase (UNICODE *pStr);
 
-extern void NPCPhrase_cb (int index, void (*cb) ());
+extern void NPCPhrase_cb (int index, void (*cb) (void));
 #define NPCPhrase(index) NPCPhrase_cb ((index), NULL)
 
 extern void GetAllianceName (UNICODE *buf, RESPONSE_REF name_1);
diff --git a/sc2/src/sc2code/libs/decomp/lzencode.c b/sc2/src/sc2code/libs/decomp/lzencode.c
index 6a0e7cde6..b0a556b3e 100644
--- a/sc2/src/sc2code/libs/decomp/lzencode.c
+++ b/sc2/src/sc2code/libs/decomp/lzencode.c
@@ -295,7 +295,7 @@ UninitTree (void)
 }
 
 static void
-_encode_cleanup ()
+_encode_cleanup (void)
 {
 	UWORD r, s, last_match_length, len;
 
diff --git a/sc2/src/sc2code/libs/graphics/sdl/bbox.c b/sc2/src/sc2code/libs/graphics/sdl/bbox.c
index e618b2cf7..b1904728a 100644
--- a/sc2/src/sc2code/libs/graphics/sdl/bbox.c
+++ b/sc2/src/sc2code/libs/graphics/sdl/bbox.c
@@ -4,7 +4,7 @@
 TFB_BoundingBox TFB_BBox;
 
 void
-TFB_BBox_Reset ()
+TFB_BBox_Reset (void)
 {
 	TFB_BBox.valid = 0;
 	TFB_BBox.clip.corner.x = 0;
diff --git a/sc2/src/sc2code/libs/graphics/sdl/bbox.h b/sc2/src/sc2code/libs/graphics/sdl/bbox.h
index 23fda20b4..d78e6af74 100644
--- a/sc2/src/sc2code/libs/graphics/sdl/bbox.h
+++ b/sc2/src/sc2code/libs/graphics/sdl/bbox.h
@@ -24,7 +24,7 @@ void TFB_BBox_RegisterPoint (int x, int y);
 void TFB_BBox_RegisterRect (PRECT r);
 void TFB_BBox_RegisterCanvas (TFB_Canvas c, int x, int y);
 
-void TFB_BBox_Reset ();
+void TFB_BBox_Reset (void);
 void TFB_BBox_GetClipRect (TFB_Canvas c);
 
 #endif
diff --git a/sc2/src/sc2code/libs/graphics/sdl/opengl.c b/sc2/src/sc2code/libs/graphics/sdl/opengl.c
index 23c16b74f..ae2cc9add 100644
--- a/sc2/src/sc2code/libs/graphics/sdl/opengl.c
+++ b/sc2/src/sc2code/libs/graphics/sdl/opengl.c
@@ -46,7 +46,7 @@ static BOOLEAN upload_transitiontexture = FALSE;
 
 
 static SDL_Surface *
-Create_Screen ()
+Create_Screen (void)
 {
 	SDL_Surface *result = SDL_CreateRGBSurface(SDL_SWSURFACE, ScreenWidth, ScreenHeight, 32,
 		R_MASK, G_MASK, B_MASK, 0x00000000);
diff --git a/sc2/src/sc2code/libs/graphics/sdl/sdl_common.c b/sc2/src/sc2code/libs/graphics/sdl/sdl_common.c
index b4dc77bd2..b1aae5741 100644
--- a/sc2/src/sc2code/libs/graphics/sdl/sdl_common.c
+++ b/sc2/src/sc2code/libs/graphics/sdl/sdl_common.c
@@ -390,7 +390,7 @@ void TFB_BlitSurface (SDL_Surface *src, SDL_Rect *srcrect, SDL_Surface *dst,
 }
 
 void
-TFB_ComputeFPS ()
+TFB_ComputeFPS (void)
 {
 	static Uint32 last_time = 0, fps_counter = 0;
 	Uint32 current_time, delta_time;
diff --git a/sc2/src/sc2code/libs/math/fastrand.c b/sc2/src/sc2code/libs/math/fastrand.c
index 0ee933677..7b2db2ae5 100644
--- a/sc2/src/sc2code/libs/math/fastrand.c
+++ b/sc2/src/sc2code/libs/math/fastrand.c
@@ -27,8 +27,8 @@ COUNT fast_index = 0; /* fast random cycling index */
 /* ----------------------------PROTOTYPES--------------------------------- */
 
 DWORD indexed_random_table(COUNT index);
-void reseed_fast_random();
-DWORD fast_random();
+void reseed_fast_random(void);
+DWORD fast_random(void);
 DWORD seed_fast_random(DWORD seed);
 
 /*****************************************************************************
@@ -72,7 +72,7 @@ seed_fast_random(DWORD seed)
 *****************************************************************************/
 
 DWORD
-fast_random()
+fast_random(void)
 {
 		fast_index++;
 		if( fast_index == TABLE_SIZE )
@@ -93,7 +93,7 @@ fast_random()
 *****************************************************************************/
 
 void
-reseed_fast_random()
+reseed_fast_random(void)
 {
 		fast_index = (COUNT)(TFB_Random() % TABLE_SIZE);
 		
diff --git a/sc2/src/sc2code/libs/sound/sfx.c b/sc2/src/sc2code/libs/sound/sfx.c
index aae5fef52..081e444fd 100644
--- a/sc2/src/sc2code/libs/sound/sfx.c
+++ b/sc2/src/sc2code/libs/sound/sfx.c
@@ -21,7 +21,7 @@
 
 #include "sound.h"
 
-static void CheckFinishedChannels ();
+static void CheckFinishedChannels (void);
 
 
 void
@@ -46,7 +46,7 @@ StopChannel (COUNT channel, unsigned char Priority)
 }
 
 static void
-CheckFinishedChannels ()
+CheckFinishedChannels (void)
 {
 	int i;
 
diff --git a/sc2/src/sc2code/libs/sound/sound.h b/sc2/src/sc2code/libs/sound/sound.h
index b9a89447f..44ab8df5c 100644
--- a/sc2/src/sc2code/libs/sound/sound.h
+++ b/sc2/src/sc2code/libs/sound/sound.h
@@ -40,7 +40,7 @@ typedef struct
 	int type;
 	uint32 value;
 	void *data;
-	void (*callback) ();
+	void (*callback) (void);
 } TFB_SoundTag;
 
 enum
diff --git a/sc2/src/sc2code/libs/sound/trackplayer.c b/sc2/src/sc2code/libs/sound/trackplayer.c
index ab481802e..b3c3964b2 100644
--- a/sc2/src/sc2code/libs/sound/trackplayer.c
+++ b/sc2/src/sc2code/libs/sound/trackplayer.c
@@ -373,7 +373,7 @@ SpliceMultiTrack (UNICODE *TrackNames[], UNICODE *TrackText)
 }
 
 void
-SpliceTrack (UNICODE *TrackName, UNICODE *TrackText, UNICODE *TimeStamp, void (*cb) ())
+SpliceTrack (UNICODE *TrackName, UNICODE *TrackText, UNICODE *TimeStamp, void (*cb) (void))
 {
 	unsigned long startTime;
 	UNICODE **split_text = NULL;
diff --git a/sc2/src/sc2code/libs/sound/trackplayer.h b/sc2/src/sc2code/libs/sound/trackplayer.h
index b8215d364..4c486aa95 100644
--- a/sc2/src/sc2code/libs/sound/trackplayer.h
+++ b/sc2/src/sc2code/libs/sound/trackplayer.h
@@ -21,16 +21,16 @@
 
 #define ACCEL_SCROLL_SPEED 30
 
-void ResumeTrack();
-void PauseTrack();
-COUNT PlayingTrack();
-void JumpTrack();
-void FastForward_Smooth();
-void FastForward_Page();
-void FastReverse_Smooth();
-void FastReverse_Page();
-void StopTrack();
-void SpliceTrack(UNICODE *filespec, UNICODE *textspec, UNICODE *TimeStamp, void (*cb) ());
+void ResumeTrack(void);
+void PauseTrack(void);
+COUNT PlayingTrack(void);
+void JumpTrack(void);
+void FastForward_Smooth(void);
+void FastForward_Page(void);
+void FastReverse_Smooth(void);
+void FastReverse_Page(void);
+void StopTrack(void);
+void SpliceTrack(UNICODE *filespec, UNICODE *textspec, UNICODE *TimeStamp, void (*cb) (void));
 void SpliceMultiTrack (UNICODE *TrackNames[], UNICODE *TrackText);
 int GetSoundData (void *data);
 int GetSoundInfo (int max_len);
diff --git a/sc2/src/sc2code/planets/plangen.c b/sc2/src/sc2code/planets/plangen.c
index 472dbd44a..0bf52bad7 100644
--- a/sc2/src/sc2code/planets/plangen.c
+++ b/sc2/src/sc2code/planets/plangen.c
@@ -475,7 +475,7 @@ SetPlanetTilt (int angle)
 #define SHIELD_RADIUS (RADIUS + 5) 
 #define SHIELD_DIAM ((SHIELD_RADIUS << 1) + 1)
 #define SHIELD_RADIUS_2 (SHIELD_RADIUS * SHIELD_RADIUS)
-static void CreateShieldMask ()
+static void CreateShieldMask (void)
 {
 
 	DWORD rad2, clear, *rgba, *p_rgba, p;
diff --git a/sc2/src/sc2code/planets/report.c b/sc2/src/sc2code/planets/report.c
index 98b37fca9..67527e42e 100644
--- a/sc2/src/sc2code/planets/report.c
+++ b/sc2/src/sc2code/planets/report.c
@@ -27,7 +27,7 @@
 extern FRAME SpaceJunkFrame;
 
 static void
-ClearReportArea ()
+ClearReportArea (void)
 {
 	COUNT i;
 	RECT r;
diff --git a/sc2/src/sc2code/setup.c b/sc2/src/sc2code/setup.c
index a423b9327..2843e7fc5 100644
--- a/sc2/src/sc2code/setup.c
+++ b/sc2/src/sc2code/setup.c
@@ -275,7 +275,7 @@ LoadKeyConfig (FILE *fp, DWORD length)
 }
 
 static void
-initKeyConfig() {
+initKeyConfig(void) {
 	char userFile[PATH_MAX];    /* System-wide key config */
 	FILE *fp;
 	int cb;
diff --git a/sc2/src/sc2code/ships/androsyn/androsyn.c b/sc2/src/sc2code/ships/androsyn/androsyn.c
index 8b22a75a4..41472e15a 100644
--- a/sc2/src/sc2code/ships/androsyn/androsyn.c
+++ b/sc2/src/sc2code/ships/androsyn/androsyn.c
@@ -214,10 +214,7 @@ initialize_bubble (PELEMENT ShipPtr, HELEMENT BubbleArray[])
 }
 
 static void
-androsynth_intelligence (ShipPtr, ObjectsOfConcern, ConcernCounter)
-PELEMENT ShipPtr;
-PEVALUATE_DESC ObjectsOfConcern;
-COUNT ConcernCounter;
+androsynth_intelligence (PELEMENT ShipPtr, PEVALUATE_DESC ObjectsOfConcern, COUNT ConcernCounter)
 {
 	PEVALUATE_DESC lpEvalDesc;
 	STARSHIPPTR StarShipPtr;
@@ -456,7 +453,7 @@ androsynth_preprocess (PELEMENT ElementPtr)
 }
 
 RACE_DESCPTR
-init_androsynth ()
+init_androsynth (void)
 {
 	RACE_DESCPTR RaceDescPtr;
 
diff --git a/sc2/src/sc2code/ships/blackurq/blackurq.c b/sc2/src/sc2code/ships/blackurq/blackurq.c
index 688232793..d58ff0279 100644
--- a/sc2/src/sc2code/ships/blackurq/blackurq.c
+++ b/sc2/src/sc2code/ships/blackurq/blackurq.c
@@ -108,8 +108,7 @@ static RACE_DESC black_urquan_desc =
 #define MAX_SAWS 8
 
 static void
-spin_preprocess (ElementPtr)
-PELEMENT ElementPtr;
+spin_preprocess (PELEMENT ElementPtr)
 {
 	ELEMENTPTR ShipPtr;
 	STARSHIPPTR StarShipPtr;
@@ -342,10 +341,7 @@ initialize_buzzsaw (PELEMENT ShipPtr, HELEMENT SawArray[])
 }
 
 static void
-black_urquan_intelligence (ShipPtr, ObjectsOfConcern, ConcernCounter)
-PELEMENT ShipPtr;
-PEVALUATE_DESC ObjectsOfConcern;
-COUNT ConcernCounter;
+black_urquan_intelligence (PELEMENT ShipPtr, PEVALUATE_DESC ObjectsOfConcern, COUNT ConcernCounter)
 {
 	PEVALUATE_DESC lpEvalDesc;
 	STARSHIPPTR StarShipPtr;
@@ -458,8 +454,7 @@ gas_cloud_collision (PELEMENT ElementPtr0, PPOINT pPt0, PELEMENT ElementPtr1, PP
 }
 
 static void
-spawn_gas_cloud (ElementPtr)
-PELEMENT ElementPtr;
+spawn_gas_cloud (PELEMENT ElementPtr)
 {
 #define GAS_SPEED 16
 #define GAS_HITS 100
@@ -545,7 +540,7 @@ black_urquan_preprocess (PELEMENT ElementPtr)
 }
 
 RACE_DESCPTR
-init_black_urquan ()
+init_black_urquan (void)
 {
 	RACE_DESCPTR RaceDescPtr;
 
@@ -560,4 +555,3 @@ init_black_urquan ()
 
 	return (RaceDescPtr);
 }
-
diff --git a/sc2/src/sc2code/ships/chenjesu/chenjesu.c b/sc2/src/sc2code/ships/chenjesu/chenjesu.c
index d8cd9dafe..e4730c015 100644
--- a/sc2/src/sc2code/ships/chenjesu/chenjesu.c
+++ b/sc2/src/sc2code/ships/chenjesu/chenjesu.c
@@ -330,8 +330,7 @@ doggy_collision (PELEMENT ElementPtr0, PPOINT pPt0, PELEMENT ElementPtr1, PPOINT
 #define CHENJESU_OFFSET 16
 
 static void
-spawn_doggy (ElementPtr)
-PELEMENT ElementPtr;
+spawn_doggy (PELEMENT ElementPtr)
 {
 	HELEMENT hDoggyElement;
 
@@ -379,10 +378,7 @@ PELEMENT ElementPtr;
 }
 
 static void
-chenjesu_intelligence (ShipPtr, ObjectsOfConcern, ConcernCounter)
-PELEMENT ShipPtr;
-PEVALUATE_DESC ObjectsOfConcern;
-COUNT ConcernCounter;
+chenjesu_intelligence (PELEMENT ShipPtr, PEVALUATE_DESC ObjectsOfConcern, COUNT ConcernCounter)
 {
 	PEVALUATE_DESC lpEvalDesc;
 	STARSHIPPTR StarShipPtr;
@@ -565,7 +561,7 @@ chenjesu_preprocess (PELEMENT ElementPtr)
 }
 
 RACE_DESCPTR
-init_chenjesu ()
+init_chenjesu (void)
 {
 	RACE_DESCPTR RaceDescPtr;
 
diff --git a/sc2/src/sc2code/ships/chmmr/chmmr.c b/sc2/src/sc2code/ships/chmmr/chmmr.c
index e41711728..1a320b2ec 100644
--- a/sc2/src/sc2code/ships/chmmr/chmmr.c
+++ b/sc2/src/sc2code/ships/chmmr/chmmr.c
@@ -242,10 +242,7 @@ initialize_megawatt_laser (PELEMENT ShipPtr, HELEMENT LaserArray[])
 }
 
 static void
-chmmr_intelligence (ShipPtr, ObjectsOfConcern, ConcernCounter)
-PELEMENT ShipPtr;
-PEVALUATE_DESC ObjectsOfConcern;
-COUNT ConcernCounter;
+chmmr_intelligence (PELEMENT ShipPtr, PEVALUATE_DESC ObjectsOfConcern, COUNT ConcernCounter)
 {
 	STARSHIPPTR StarShipPtr;
 	PEVALUATE_DESC lpEvalDesc;
@@ -742,7 +739,7 @@ chmmr_preprocess (PELEMENT ElementPtr)
 }
 
 RACE_DESCPTR
-init_chmmr ()
+init_chmmr (void)
 {
 	RACE_DESCPTR RaceDescPtr;
 
diff --git a/sc2/src/sc2code/ships/druuge/druuge.c b/sc2/src/sc2code/ships/druuge/druuge.c
index b589b6b73..880ec062b 100644
--- a/sc2/src/sc2code/ships/druuge/druuge.c
+++ b/sc2/src/sc2code/ships/druuge/druuge.c
@@ -183,10 +183,7 @@ initialize_cannon (PELEMENT ShipPtr, HELEMENT CannonArray[])
 }
 
 static void
-druuge_intelligence (ShipPtr, ObjectsOfConcern, ConcernCounter)
-PELEMENT ShipPtr;
-PEVALUATE_DESC ObjectsOfConcern;
-COUNT ConcernCounter;
+druuge_intelligence (PELEMENT ShipPtr, PEVALUATE_DESC ObjectsOfConcern, COUNT ConcernCounter)
 {
 	UWORD ship_flags;
 	STARSHIPPTR StarShipPtr, EnemyStarShipPtr;
@@ -300,7 +297,7 @@ druuge_preprocess (PELEMENT ElementPtr)
 }
 
 RACE_DESCPTR
-init_druuge ()
+init_druuge (void)
 {
 	RACE_DESCPTR RaceDescPtr;
 
diff --git a/sc2/src/sc2code/ships/human/human.c b/sc2/src/sc2code/ships/human/human.c
index db56f6f73..36e403d49 100644
--- a/sc2/src/sc2code/ships/human/human.c
+++ b/sc2/src/sc2code/ships/human/human.c
@@ -291,10 +291,7 @@ initialize_nuke (PELEMENT ShipPtr, HELEMENT NukeArray[])
 }
 
 static void
-human_intelligence (ShipPtr, ObjectsOfConcern, ConcernCounter)
-PELEMENT ShipPtr;
-PEVALUATE_DESC ObjectsOfConcern;
-COUNT ConcernCounter;
+human_intelligence (PELEMENT ShipPtr, PEVALUATE_DESC ObjectsOfConcern, COUNT ConcernCounter)
 {
 	STARSHIPPTR StarShipPtr;
 
@@ -335,7 +332,7 @@ human_postprocess (PELEMENT ElementPtr)
 }
 
 RACE_DESCPTR
-init_human ()
+init_human (void)
 {
 	RACE_DESCPTR RaceDescPtr;
 
diff --git a/sc2/src/sc2code/ships/ilwrath/ilwrath.c b/sc2/src/sc2code/ships/ilwrath/ilwrath.c
index 979ef4094..84a22e890 100644
--- a/sc2/src/sc2code/ships/ilwrath/ilwrath.c
+++ b/sc2/src/sc2code/ships/ilwrath/ilwrath.c
@@ -125,10 +125,7 @@ flame_collision (PELEMENT ElementPtr0, PPOINT pPt0, PELEMENT ElementPtr1, PPOINT
 }
 
 static void
-ilwrath_intelligence (ShipPtr, ObjectsOfConcern, ConcernCounter)
-PELEMENT ShipPtr;
-PEVALUATE_DESC ObjectsOfConcern;
-COUNT ConcernCounter;
+ilwrath_intelligence (PELEMENT ShipPtr, PEVALUATE_DESC ObjectsOfConcern, COUNT ConcernCounter)
 {
 	PEVALUATE_DESC lpEvalDesc;
 	STARSHIPPTR StarShipPtr;
@@ -359,7 +356,7 @@ ilwrath_preprocess (PELEMENT ElementPtr)
 }
 
 RACE_DESCPTR
-init_ilwrath ()
+init_ilwrath (void)
 {
 	RACE_DESCPTR RaceDescPtr;
 
diff --git a/sc2/src/sc2code/ships/lastbat/lastbat.c b/sc2/src/sc2code/ships/lastbat/lastbat.c
index d400b93e1..99e3ce4b3 100644
--- a/sc2/src/sc2code/ships/lastbat/lastbat.c
+++ b/sc2/src/sc2code/ships/lastbat/lastbat.c
@@ -663,10 +663,7 @@ sentinel_collision (PELEMENT ElementPtr0, PPOINT pPt0, PELEMENT ElementPtr1, PPO
 }
 
 static void
-samatra_intelligence (ShipPtr, ObjectsOfConcern, ConcernCounter)
-PELEMENT ShipPtr;
-PEVALUATE_DESC ObjectsOfConcern;
-COUNT ConcernCounter;
+samatra_intelligence (PELEMENT ShipPtr, PEVALUATE_DESC ObjectsOfConcern, COUNT ConcernCounter)
 {
 	ship_intelligence (ShipPtr, ObjectsOfConcern, ConcernCounter);
 }
@@ -886,7 +883,7 @@ samatra_preprocess (PELEMENT ElementPtr)
 }
 
 RACE_DESCPTR
-init_samatra ()
+init_samatra (void)
 {
 	RACE_DESCPTR RaceDescPtr;
 
diff --git a/sc2/src/sc2code/ships/melnorme/melnorme.c b/sc2/src/sc2code/ships/melnorme/melnorme.c
index d3bb33191..1b6eb742b 100644
--- a/sc2/src/sc2code/ships/melnorme/melnorme.c
+++ b/sc2/src/sc2code/ships/melnorme/melnorme.c
@@ -537,10 +537,7 @@ initialize_test_pump_up (PELEMENT ShipPtr, HELEMENT PumpUpArray[])
 }
 
 static void
-melnorme_intelligence (ShipPtr, ObjectsOfConcern, ConcernCounter)
-PELEMENT ShipPtr;
-PEVALUATE_DESC ObjectsOfConcern;
-COUNT ConcernCounter;
+melnorme_intelligence (PELEMENT ShipPtr, PEVALUATE_DESC ObjectsOfConcern, COUNT ConcernCounter)
 {
 	COUNT old_count;
 	STARSHIPPTR StarShipPtr;
@@ -638,7 +635,7 @@ melnorme_postprocess (PELEMENT ElementPtr)
 }
 
 RACE_DESCPTR
-init_melnorme ()
+init_melnorme (void)
 {
 	RACE_DESCPTR RaceDescPtr;
 
diff --git a/sc2/src/sc2code/ships/mmrnmhrm/mmrnmhrm.c b/sc2/src/sc2code/ships/mmrnmhrm/mmrnmhrm.c
index 72114be26..5aa802f4e 100644
--- a/sc2/src/sc2code/ships/mmrnmhrm/mmrnmhrm.c
+++ b/sc2/src/sc2code/ships/mmrnmhrm/mmrnmhrm.c
@@ -144,10 +144,7 @@ missile_preprocess (PELEMENT ElementPtr)
 }
 
 static void
-mmrnmhrm_intelligence (ShipPtr, ObjectsOfConcern, ConcernCounter)
-PELEMENT ShipPtr;
-PEVALUATE_DESC ObjectsOfConcern;
-COUNT ConcernCounter;
+mmrnmhrm_intelligence (PELEMENT ShipPtr, PEVALUATE_DESC ObjectsOfConcern, COUNT ConcernCounter)
 {
 	BOOLEAN CanTransform;
 	PEVALUATE_DESC lpEvalDesc;
@@ -452,7 +449,7 @@ mmrnmhrm_preprocess (PELEMENT ElementPtr)
 }
 
 RACE_DESCPTR
-init_mmrnmhrm ()
+init_mmrnmhrm (void)
 {
 	RACE_DESCPTR RaceDescPtr;
 
diff --git a/sc2/src/sc2code/ships/mycon/mycon.c b/sc2/src/sc2code/ships/mycon/mycon.c
index df2b626ea..ace66ce89 100644
--- a/sc2/src/sc2code/ships/mycon/mycon.c
+++ b/sc2/src/sc2code/ships/mycon/mycon.c
@@ -218,10 +218,7 @@ plasma_collision (PELEMENT ElementPtr0, PPOINT pPt0, PELEMENT ElementPtr1, PPOIN
 }
 
 static void
-mycon_intelligence (ShipPtr, ObjectsOfConcern, ConcernCounter)
-PELEMENT ShipPtr;
-PEVALUATE_DESC ObjectsOfConcern;
-COUNT ConcernCounter;
+mycon_intelligence (PELEMENT ShipPtr, PEVALUATE_DESC ObjectsOfConcern, COUNT ConcernCounter)
 {
 	STARSHIPPTR StarShipPtr;
 	PEVALUATE_DESC lpEvalDesc;
@@ -354,7 +351,7 @@ mycon_postprocess (PELEMENT ElementPtr)
 }
 
 RACE_DESCPTR
-init_mycon ()
+init_mycon (void)
 {
 	RACE_DESCPTR RaceDescPtr;
 
diff --git a/sc2/src/sc2code/ships/orz/orz.c b/sc2/src/sc2code/ships/orz/orz.c
index 9ddc34599..a657569c5 100644
--- a/sc2/src/sc2code/ships/orz/orz.c
+++ b/sc2/src/sc2code/ships/orz/orz.c
@@ -217,10 +217,7 @@ count_marines (STARSHIPPTR StarShipPtr, BOOLEAN FindSpot)
 }
 
 static void
-orz_intelligence (ShipPtr, ObjectsOfConcern, ConcernCounter)
-PELEMENT ShipPtr;
-PEVALUATE_DESC ObjectsOfConcern;
-COUNT ConcernCounter;
+orz_intelligence (PELEMENT ShipPtr, PEVALUATE_DESC ObjectsOfConcern, COUNT ConcernCounter)
 {
 	ELEMENTPTR TurretPtr;
 	STARSHIPPTR StarShipPtr;
@@ -1059,7 +1056,7 @@ orz_preprocess (PELEMENT ElementPtr)
 }
 
 RACE_DESCPTR
-init_orz ()
+init_orz (void)
 {
 	RACE_DESCPTR RaceDescPtr;
 
diff --git a/sc2/src/sc2code/ships/pkunk/pkunk.c b/sc2/src/sc2code/ships/pkunk/pkunk.c
index 83dc4f8de..2c5b1d1e2 100644
--- a/sc2/src/sc2code/ships/pkunk/pkunk.c
+++ b/sc2/src/sc2code/ships/pkunk/pkunk.c
@@ -174,10 +174,7 @@ initialize_bug_missile (PELEMENT ShipPtr, HELEMENT MissileArray[])
 static HELEMENT hPhoenix = 0;
 
 static void
-pkunk_intelligence (ShipPtr, ObjectsOfConcern, ConcernCounter)
-PELEMENT ShipPtr;
-PEVALUATE_DESC ObjectsOfConcern;
-COUNT ConcernCounter;
+pkunk_intelligence (PELEMENT ShipPtr, PEVALUATE_DESC ObjectsOfConcern, COUNT ConcernCounter)
 {
 	STARSHIPPTR StarShipPtr;
 
@@ -545,7 +542,7 @@ PELEMENT ElementPtr;
 }
 
 RACE_DESCPTR
-init_pkunk ()
+init_pkunk (void)
 {
 	RACE_DESCPTR RaceDescPtr;
 
diff --git a/sc2/src/sc2code/ships/probe/probe.c b/sc2/src/sc2code/ships/probe/probe.c
index 5187aae0a..43e8debea 100644
--- a/sc2/src/sc2code/ships/probe/probe.c
+++ b/sc2/src/sc2code/ships/probe/probe.c
@@ -101,7 +101,7 @@ static RACE_DESC probe_desc =
 };
 
 RACE_DESCPTR
-init_probe ()
+init_probe (void)
 {
 	RACE_DESCPTR RaceDescPtr;
 
diff --git a/sc2/src/sc2code/ships/shofixti/shofixti.c b/sc2/src/sc2code/ships/shofixti/shofixti.c
index bceb3f54b..d37b9397c 100644
--- a/sc2/src/sc2code/ships/shofixti/shofixti.c
+++ b/sc2/src/sc2code/ships/shofixti/shofixti.c
@@ -300,10 +300,7 @@ self_destruct (PELEMENT ElementPtr)
 }
 
 static void
-shofixti_intelligence (ShipPtr, ObjectsOfConcern, ConcernCounter)
-PELEMENT ShipPtr;
-PEVALUATE_DESC ObjectsOfConcern;
-COUNT ConcernCounter;
+shofixti_intelligence (PELEMENT ShipPtr, PEVALUATE_DESC ObjectsOfConcern, COUNT ConcernCounter)
 {
 	STARSHIPPTR StarShipPtr;
 
@@ -356,7 +353,7 @@ shofixti_postprocess (PELEMENT ElementPtr)
 }
 
 RACE_DESCPTR
-init_shofixti ()
+init_shofixti (void)
 {
 	RACE_DESCPTR RaceDescPtr;
 
diff --git a/sc2/src/sc2code/ships/sis_ship/sis_ship.c b/sc2/src/sc2code/ships/sis_ship/sis_ship.c
index f2c6f3315..e0534f1a8 100644
--- a/sc2/src/sc2code/ships/sis_ship/sis_ship.c
+++ b/sc2/src/sc2code/ships/sis_ship/sis_ship.c
@@ -658,10 +658,7 @@ initialize_blasters (PELEMENT ShipPtr, HELEMENT BlasterArray[])
 }
 
 static void
-sis_intelligence (ShipPtr, ObjectsOfConcern, ConcernCounter)
-PELEMENT ShipPtr;
-PEVALUATE_DESC ObjectsOfConcern;
-COUNT ConcernCounter;
+sis_intelligence (PELEMENT ShipPtr, PEVALUATE_DESC ObjectsOfConcern, COUNT ConcernCounter)
 {
 	PEVALUATE_DESC lpEvalDesc;
 	STARSHIPPTR StarShipPtr;
@@ -733,7 +730,7 @@ COUNT ConcernCounter;
 }
 
 RACE_DESCPTR
-init_sis ()
+init_sis (void)
 {
 	RACE_DESCPTR RaceDescPtr;
 
diff --git a/sc2/src/sc2code/ships/slylandr/slylandr.c b/sc2/src/sc2code/ships/slylandr/slylandr.c
index 49565250c..7f7b103d5 100644
--- a/sc2/src/sc2code/ships/slylandr/slylandr.c
+++ b/sc2/src/sc2code/ships/slylandr/slylandr.c
@@ -243,10 +243,7 @@ initialize_lightning (PELEMENT ElementPtr, HELEMENT LaserArray[])
 }
 
 static void
-slylandro_intelligence (ShipPtr, ObjectsOfConcern, ConcernCounter)
-PELEMENT ShipPtr;
-PEVALUATE_DESC ObjectsOfConcern;
-COUNT ConcernCounter;
+slylandro_intelligence (PELEMENT ShipPtr, PEVALUATE_DESC ObjectsOfConcern, COUNT ConcernCounter)
 {
 	PEVALUATE_DESC lpEvalDesc;
 	STARSHIPPTR StarShipPtr;
@@ -286,8 +283,7 @@ COUNT ConcernCounter;
 }
 
 static BOOLEAN
-harvest_space_junk (ElementPtr)
-PELEMENT ElementPtr;
+harvest_space_junk (PELEMENT ElementPtr)
 {
 	BOOLEAN retval;
 	HELEMENT hElement, hNextElement;
@@ -412,7 +408,7 @@ slylandro_preprocess (PELEMENT ElementPtr)
 }
 
 RACE_DESCPTR
-init_slylandro ()
+init_slylandro (void)
 {
 	RACE_DESCPTR RaceDescPtr;
 
@@ -427,4 +423,3 @@ init_slylandro ()
 
 	return (RaceDescPtr);
 }
-
diff --git a/sc2/src/sc2code/ships/spathi/spathi.c b/sc2/src/sc2code/ships/spathi/spathi.c
index d7be9c179..ee5049615 100644
--- a/sc2/src/sc2code/ships/spathi/spathi.c
+++ b/sc2/src/sc2code/ships/spathi/spathi.c
@@ -132,8 +132,7 @@ butt_missile_preprocess (PELEMENT ElementPtr)
 }
 
 static void
-spawn_butt_missile (ShipPtr)
-PELEMENT ShipPtr;
+spawn_butt_missile (PELEMENT ShipPtr)
 {
 #define SPATHI_REAR_OFFSET 20
 #define DISCRIMINATOR_LIFE 30
@@ -173,10 +172,7 @@ PELEMENT ShipPtr;
 }
 
 static void
-spathi_intelligence (ShipPtr, ObjectsOfConcern, ConcernCounter)
-PELEMENT ShipPtr;
-PEVALUATE_DESC ObjectsOfConcern;
-COUNT ConcernCounter;
+spathi_intelligence (PELEMENT ShipPtr, PEVALUATE_DESC ObjectsOfConcern, COUNT ConcernCounter)
 {
 	STARSHIPPTR StarShipPtr;
 	PEVALUATE_DESC lpEvalDesc;
@@ -277,7 +273,7 @@ spathi_postprocess (PELEMENT ElementPtr)
 }
 
 RACE_DESCPTR
-init_spathi ()
+init_spathi (void)
 {
 	RACE_DESCPTR RaceDescPtr;
 
@@ -291,4 +287,3 @@ init_spathi ()
 
 	return (RaceDescPtr);
 }
-
diff --git a/sc2/src/sc2code/ships/supox/supox.c b/sc2/src/sc2code/ships/supox/supox.c
index da57f9aa8..0f0557909 100644
--- a/sc2/src/sc2code/ships/supox/supox.c
+++ b/sc2/src/sc2code/ships/supox/supox.c
@@ -103,10 +103,7 @@ static RACE_DESC supox_desc =
 };
 
 static void
-supox_intelligence (ShipPtr, ObjectsOfConcern, ConcernCounter)
-PELEMENT ShipPtr;
-PEVALUATE_DESC ObjectsOfConcern;
-COUNT ConcernCounter;
+supox_intelligence (PELEMENT ShipPtr, PEVALUATE_DESC ObjectsOfConcern, COUNT ConcernCounter)
 {
 	STARSHIPPTR StarShipPtr;
 	PEVALUATE_DESC lpEvalDesc;
@@ -261,7 +258,7 @@ supox_preprocess (PELEMENT ElementPtr)
 }
 
 RACE_DESCPTR
-init_supox ()
+init_supox (void)
 {
 	RACE_DESCPTR RaceDescPtr;
 
diff --git a/sc2/src/sc2code/ships/syreen/syreen.c b/sc2/src/sc2code/ships/syreen/syreen.c
index d5f4221c0..775e9136a 100644
--- a/sc2/src/sc2code/ships/syreen/syreen.c
+++ b/sc2/src/sc2code/ships/syreen/syreen.c
@@ -211,10 +211,7 @@ spawn_crew (PELEMENT ElementPtr)
 }
 
 static void
-syreen_intelligence (ShipPtr, ObjectsOfConcern, ConcernCounter)
-PELEMENT ShipPtr;
-PEVALUATE_DESC ObjectsOfConcern;
-COUNT ConcernCounter;
+syreen_intelligence (PELEMENT ShipPtr, PEVALUATE_DESC ObjectsOfConcern, COUNT ConcernCounter)
 {
 	PEVALUATE_DESC lpEvalDesc;
 
@@ -259,7 +256,7 @@ syreen_postprocess (PELEMENT ElementPtr)
 }
 
 RACE_DESCPTR
-init_syreen ()
+init_syreen (void)
 {
 	RACE_DESCPTR RaceDescPtr;
 
diff --git a/sc2/src/sc2code/ships/thradd/thradd.c b/sc2/src/sc2code/ships/thradd/thradd.c
index c1e189b76..5f421d45f 100644
--- a/sc2/src/sc2code/ships/thradd/thradd.c
+++ b/sc2/src/sc2code/ships/thradd/thradd.c
@@ -104,10 +104,7 @@ static RACE_DESC thraddash_desc =
 };
 
 static void
-thraddash_intelligence (ShipPtr, ObjectsOfConcern, ConcernCounter)
-PELEMENT ShipPtr;
-PEVALUATE_DESC ObjectsOfConcern;
-COUNT ConcernCounter;
+thraddash_intelligence (PELEMENT ShipPtr, PEVALUATE_DESC ObjectsOfConcern, COUNT ConcernCounter)
 {
 
 	STARSHIPPTR StarShipPtr;
@@ -367,7 +364,7 @@ thraddash_preprocess (PELEMENT ElementPtr)
 }
 
 RACE_DESCPTR
-init_thraddash ()
+init_thraddash (void)
 {
 	RACE_DESCPTR RaceDescPtr;
 
@@ -381,4 +378,3 @@ init_thraddash ()
 
 	return (RaceDescPtr);
 }
-
diff --git a/sc2/src/sc2code/ships/umgah/umgah.c b/sc2/src/sc2code/ships/umgah/umgah.c
index 1b0c29849..3423e106c 100644
--- a/sc2/src/sc2code/ships/umgah/umgah.c
+++ b/sc2/src/sc2code/ships/umgah/umgah.c
@@ -133,10 +133,7 @@ cone_collision (PELEMENT ElementPtr0, PPOINT pPt0, PELEMENT ElementPtr1, PPOINT
 #define JUMP_DIST DISPLAY_TO_WORLD (40)
 
 static void
-umgah_intelligence (ShipPtr, ObjectsOfConcern, ConcernCounter)
-PELEMENT ShipPtr;
-PEVALUATE_DESC ObjectsOfConcern;
-COUNT ConcernCounter;
+umgah_intelligence (PELEMENT ShipPtr, PEVALUATE_DESC ObjectsOfConcern, COUNT ConcernCounter)
 {
 	PEVALUATE_DESC lpEvalDesc;
 	STARSHIPPTR StarShipPtr, EnemyStarShipPtr;
@@ -352,7 +349,7 @@ umgah_preprocess (PELEMENT ElementPtr)
 }
 
 RACE_DESCPTR
-init_umgah ()
+init_umgah (void)
 {
 	RACE_DESCPTR RaceDescPtr;
 
diff --git a/sc2/src/sc2code/ships/urquan/urquan.c b/sc2/src/sc2code/ships/urquan/urquan.c
index f04399e22..306ebf26a 100644
--- a/sc2/src/sc2code/ships/urquan/urquan.c
+++ b/sc2/src/sc2code/ships/urquan/urquan.c
@@ -376,8 +376,7 @@ fighter_collision (PELEMENT ElementPtr0, PPOINT pPt0, PELEMENT ElementPtr1, PPOI
 }
 
 static void
-spawn_fighters (ElementPtr)
-PELEMENT ElementPtr;
+spawn_fighters (PELEMENT ElementPtr)
 {
 	SIZE i;
 	COUNT facing;
@@ -450,10 +449,7 @@ PELEMENT ElementPtr;
 }
 
 static void
-urquan_intelligence (ShipPtr, ObjectsOfConcern, ConcernCounter)
-PELEMENT ShipPtr;
-PEVALUATE_DESC ObjectsOfConcern;
-COUNT ConcernCounter;
+urquan_intelligence (PELEMENT ShipPtr, PEVALUATE_DESC ObjectsOfConcern, COUNT ConcernCounter)
 {
 	PEVALUATE_DESC lpEvalDesc;
 	STARSHIPPTR StarShipPtr;
@@ -525,7 +521,7 @@ urquan_postprocess (PELEMENT ElementPtr)
 }
 
 RACE_DESCPTR
-init_urquan ()
+init_urquan (void)
 {
 	RACE_DESCPTR RaceDescPtr;
 
diff --git a/sc2/src/sc2code/ships/utwig/utwig.c b/sc2/src/sc2code/ships/utwig/utwig.c
index 88f291cd6..3ba7d46ac 100644
--- a/sc2/src/sc2code/ships/utwig/utwig.c
+++ b/sc2/src/sc2code/ships/utwig/utwig.c
@@ -176,10 +176,7 @@ initialize_lance (PELEMENT ShipPtr, HELEMENT WeaponArray[])
 }
 
 static void
-utwig_intelligence (ShipPtr, ObjectsOfConcern, ConcernCounter)
-PELEMENT ShipPtr;
-PEVALUATE_DESC ObjectsOfConcern;
-COUNT ConcernCounter;
+utwig_intelligence (PELEMENT ShipPtr, PEVALUATE_DESC ObjectsOfConcern, COUNT ConcernCounter)
 {
 	SIZE ShieldStatus;
 	STARSHIPPTR StarShipPtr;
@@ -352,7 +349,7 @@ utwig_preprocess (PELEMENT ElementPtr)
 }
 
 RACE_DESCPTR
-init_utwig ()
+init_utwig (void)
 {
 	RACE_DESCPTR RaceDescPtr;
 
diff --git a/sc2/src/sc2code/ships/yehat/yehat.c b/sc2/src/sc2code/ships/yehat/yehat.c
index c83817f24..bc66d56d7 100644
--- a/sc2/src/sc2code/ships/yehat/yehat.c
+++ b/sc2/src/sc2code/ships/yehat/yehat.c
@@ -142,10 +142,7 @@ initialize_standard_missiles (PELEMENT ShipPtr, HELEMENT MissileArray[])
 }
 
 static void
-yehat_intelligence (ShipPtr, ObjectsOfConcern, ConcernCounter)
-PELEMENT ShipPtr;
-PEVALUATE_DESC ObjectsOfConcern;
-COUNT ConcernCounter;
+yehat_intelligence (PELEMENT ShipPtr, PEVALUATE_DESC ObjectsOfConcern, COUNT ConcernCounter)
 {
 	SIZE ShieldStatus;
 	STARSHIPPTR StarShipPtr;
@@ -345,7 +342,7 @@ yehat_preprocess (PELEMENT ElementPtr)
 }
 
 RACE_DESCPTR
-init_yehat ()
+init_yehat (void)
 {
 	RACE_DESCPTR RaceDescPtr;
 
@@ -360,4 +357,3 @@ init_yehat ()
 
 	return (RaceDescPtr);
 }
-
diff --git a/sc2/src/sc2code/ships/zoqfot/zoqfot.c b/sc2/src/sc2code/ships/zoqfot/zoqfot.c
index 171b464a7..0a64e5234 100644
--- a/sc2/src/sc2code/ships/zoqfot/zoqfot.c
+++ b/sc2/src/sc2code/ships/zoqfot/zoqfot.c
@@ -252,10 +252,7 @@ PELEMENT ElementPtr;
 }
 
 static void
-zoqfotpik_intelligence (ShipPtr, ObjectsOfConcern, ConcernCounter)
-PELEMENT ShipPtr;
-PEVALUATE_DESC ObjectsOfConcern;
-COUNT ConcernCounter;
+zoqfotpik_intelligence (PELEMENT ShipPtr, PEVALUATE_DESC ObjectsOfConcern, COUNT ConcernCounter)
 {
 	BOOLEAN GiveTongueJob;
 	STARSHIPPTR StarShipPtr;
@@ -348,7 +345,7 @@ zoqfotpik_postprocess (PELEMENT ElementPtr)
 }
 
 RACE_DESCPTR
-init_zoqfotpik ()
+init_zoqfotpik (void)
 {
 	RACE_DESCPTR RaceDescPtr;
 
diff --git a/sc2/src/sc2code/sis.c b/sc2/src/sc2code/sis.c
index 631d5b301..3e30fd312 100644
--- a/sc2/src/sc2code/sis.c
+++ b/sc2/src/sc2code/sis.c
@@ -675,7 +675,7 @@ GetGaugeRect (PRECT pRect, BOOLEAN IsCrewRect)
 	pRect->corner.y = IsCrewRect ? 117 : 38;
 }
 
-void DrawPC_SIS ()
+void DrawPC_SIS (void)
 {
 	TEXT t;
 	RECT r;