diff --git a/INSTALL.txt b/INSTALL.txt
index d9a536406..abeba9a3a 100644
--- a/INSTALL.txt
+++ b/INSTALL.txt
@@ -5,7 +5,7 @@ To compile and install SDL:
         * Read ./docs/README-visualc.md
 
         Windows with gcc, either native or cross-compiling:
-        * Read the FAQ at https://wiki.libsdl.org/moin.fcg/FAQWindows
+        * Read the FAQ at https://wiki.libsdl.org/FAQWindows
         * Run './configure; make; make install'
 
         Mac OS X with Xcode:
diff --git a/TODO.txt b/TODO.txt
index 89637ebdb..20b205f06 100644
--- a/TODO.txt
+++ b/TODO.txt
@@ -1,5 +1,5 @@
 Future work roadmap:
- * http://wiki.libsdl.org/moin.cgi/Roadmap
+ * http://wiki.libsdl.org/Roadmap
 
  * Check 1.2 revisions:
 	3554 - Need to resolve semantics for locking keys on different platforms
diff --git a/test/testautomation_clipboard.c b/test/testautomation_clipboard.c
index dd52a6860..113c7dc89 100644
--- a/test/testautomation_clipboard.c
+++ b/test/testautomation_clipboard.c
@@ -16,7 +16,7 @@
  * \brief Check call to SDL_HasClipboardText
  *
  * \sa
- * http://wiki.libsdl.org/moin.cgi/SDL_HasClipboardText
+ * http://wiki.libsdl.org/SDL_HasClipboardText
  */
 int
 clipboard_testHasClipboardText(void *arg)
@@ -31,7 +31,7 @@ clipboard_testHasClipboardText(void *arg)
  * \brief Check call to SDL_GetClipboardText
  *
  * \sa
- * http://wiki.libsdl.org/moin.cgi/SDL_GetClipboardText
+ * http://wiki.libsdl.org/SDL_GetClipboardText
  */
 int
 clipboard_testGetClipboardText(void *arg)
@@ -48,7 +48,7 @@ clipboard_testGetClipboardText(void *arg)
 /**
  * \brief Check call to SDL_SetClipboardText
  * \sa
- * http://wiki.libsdl.org/moin.cgi/SDL_SetClipboardText
+ * http://wiki.libsdl.org/SDL_SetClipboardText
  */
 int
 clipboard_testSetClipboardText(void *arg)
@@ -77,9 +77,9 @@ clipboard_testSetClipboardText(void *arg)
 /**
  * \brief End-to-end test of SDL_xyzClipboardText functions
  * \sa
- * http://wiki.libsdl.org/moin.cgi/SDL_HasClipboardText
- * http://wiki.libsdl.org/moin.cgi/SDL_GetClipboardText
- * http://wiki.libsdl.org/moin.cgi/SDL_SetClipboardText
+ * http://wiki.libsdl.org/SDL_HasClipboardText
+ * http://wiki.libsdl.org/SDL_GetClipboardText
+ * http://wiki.libsdl.org/SDL_SetClipboardText
  */
 int
 clipboard_testClipboardTextFunctions(void *arg)
diff --git a/test/testautomation_events.c b/test/testautomation_events.c
index 09004da52..20f2ea5e4 100644
--- a/test/testautomation_events.c
+++ b/test/testautomation_events.c
@@ -42,8 +42,8 @@ int SDLCALL _events_sampleNullEventFilter(void *userdata, SDL_Event *event)
 /**
  * @brief Test pumping and peeking events.
  *
- * @sa http://wiki.libsdl.org/moin.cgi/SDL_PumpEvents
- * @sa http://wiki.libsdl.org/moin.cgi/SDL_PollEvent
+ * @sa http://wiki.libsdl.org/SDL_PumpEvents
+ * @sa http://wiki.libsdl.org/SDL_PollEvent
  */
 int
 events_pushPumpAndPollUserevent(void *arg)
@@ -76,8 +76,8 @@ events_pushPumpAndPollUserevent(void *arg)
 /**
  * @brief Adds and deletes an event watch function with NULL userdata
  *
- * @sa http://wiki.libsdl.org/moin.cgi/SDL_AddEventWatch
- * @sa http://wiki.libsdl.org/moin.cgi/SDL_DelEventWatch
+ * @sa http://wiki.libsdl.org/SDL_AddEventWatch
+ * @sa http://wiki.libsdl.org/SDL_DelEventWatch
  *
  */
 int
@@ -126,8 +126,8 @@ events_addDelEventWatch(void *arg)
 /**
  * @brief Adds and deletes an event watch function with userdata
  *
- * @sa http://wiki.libsdl.org/moin.cgi/SDL_AddEventWatch
- * @sa http://wiki.libsdl.org/moin.cgi/SDL_DelEventWatch
+ * @sa http://wiki.libsdl.org/SDL_AddEventWatch
+ * @sa http://wiki.libsdl.org/SDL_DelEventWatch
  *
  */
 int
diff --git a/test/testautomation_keyboard.c b/test/testautomation_keyboard.c
index 837c68d66..dc05ff1c2 100644
--- a/test/testautomation_keyboard.c
+++ b/test/testautomation_keyboard.c
@@ -16,7 +16,7 @@
 /**
  * @brief Check call to SDL_GetKeyboardState with and without numkeys reference.
  *
- * @sa http://wiki.libsdl.org/moin.cgi/SDL_GetKeyboardState
+ * @sa http://wiki.libsdl.org/SDL_GetKeyboardState
  */
 int
 keyboard_getKeyboardState(void *arg)
@@ -42,7 +42,7 @@ keyboard_getKeyboardState(void *arg)
 /**
  * @brief Check call to SDL_GetKeyboardFocus
  *
- * @sa http://wiki.libsdl.org/moin.cgi/SDL_GetKeyboardFocus
+ * @sa http://wiki.libsdl.org/SDL_GetKeyboardFocus
  */
 int
 keyboard_getKeyboardFocus(void *arg)
@@ -57,7 +57,7 @@ keyboard_getKeyboardFocus(void *arg)
 /**
  * @brief Check call to SDL_GetKeyFromName for known, unknown and invalid name.
  *
- * @sa http://wiki.libsdl.org/moin.cgi/SDL_GetKeyFromName
+ * @sa http://wiki.libsdl.org/SDL_GetKeyFromName
  */
 int
 keyboard_getKeyFromName(void *arg)
@@ -124,7 +124,7 @@ _checkInvalidScancodeError()
 /**
  * @brief Check call to SDL_GetKeyFromScancode
  *
- * @sa http://wiki.libsdl.org/moin.cgi/SDL_GetKeyFromScancode
+ * @sa http://wiki.libsdl.org/SDL_GetKeyFromScancode
  */
 int
 keyboard_getKeyFromScancode(void *arg)
@@ -163,7 +163,7 @@ keyboard_getKeyFromScancode(void *arg)
 /**
  * @brief Check call to SDL_GetKeyName
  *
- * @sa http://wiki.libsdl.org/moin.cgi/SDL_GetKeyName
+ * @sa http://wiki.libsdl.org/SDL_GetKeyName
  */
 int
 keyboard_getKeyName(void *arg)
@@ -219,7 +219,7 @@ keyboard_getKeyName(void *arg)
 /**
  * @brief SDL_GetScancodeName negative cases
  *
- * @sa http://wiki.libsdl.org/moin.cgi/SDL_GetScancodeName
+ * @sa http://wiki.libsdl.org/SDL_GetScancodeName
  */
 int
 keyboard_getScancodeNameNegative(void *arg)
@@ -246,7 +246,7 @@ keyboard_getScancodeNameNegative(void *arg)
 /**
  * @brief SDL_GetKeyName negative cases
  *
- * @sa http://wiki.libsdl.org/moin.cgi/SDL_GetKeyName
+ * @sa http://wiki.libsdl.org/SDL_GetKeyName
  */
 int
 keyboard_getKeyNameNegative(void *arg)
@@ -283,8 +283,8 @@ keyboard_getKeyNameNegative(void *arg)
 /**
  * @brief Check call to SDL_GetModState and SDL_SetModState
  *
- * @sa http://wiki.libsdl.org/moin.cgi/SDL_GetModState
- * @sa http://wiki.libsdl.org/moin.cgi/SDL_SetModState
+ * @sa http://wiki.libsdl.org/SDL_GetModState
+ * @sa http://wiki.libsdl.org/SDL_SetModState
  */
 int
 keyboard_getSetModState(void *arg)
@@ -344,8 +344,8 @@ keyboard_getSetModState(void *arg)
 /**
  * @brief Check call to SDL_StartTextInput and SDL_StopTextInput
  *
- * @sa http://wiki.libsdl.org/moin.cgi/SDL_StartTextInput
- * @sa http://wiki.libsdl.org/moin.cgi/SDL_StopTextInput
+ * @sa http://wiki.libsdl.org/SDL_StartTextInput
+ * @sa http://wiki.libsdl.org/SDL_StopTextInput
  */
 int
 keyboard_startStopTextInput(void *arg)
@@ -391,7 +391,7 @@ void _testSetTextInputRect(SDL_Rect refRect)
 /**
  * @brief Check call to SDL_SetTextInputRect
  *
- * @sa http://wiki.libsdl.org/moin.cgi/SDL_SetTextInputRect
+ * @sa http://wiki.libsdl.org/SDL_SetTextInputRect
  */
 int
 keyboard_setTextInputRect(void *arg)
@@ -471,7 +471,7 @@ keyboard_setTextInputRect(void *arg)
 /**
  * @brief Check call to SDL_SetTextInputRect with invalid data
  *
- * @sa http://wiki.libsdl.org/moin.cgi/SDL_SetTextInputRect
+ * @sa http://wiki.libsdl.org/SDL_SetTextInputRect
  */
 int
 keyboard_setTextInputRectNegative(void *arg)
@@ -509,8 +509,8 @@ keyboard_setTextInputRectNegative(void *arg)
 /**
  * @brief Check call to SDL_GetScancodeFromKey
  *
- * @sa http://wiki.libsdl.org/moin.cgi/SDL_GetScancodeFromKey
- * @sa http://wiki.libsdl.org/moin.cgi/SDL_Keycode
+ * @sa http://wiki.libsdl.org/SDL_GetScancodeFromKey
+ * @sa http://wiki.libsdl.org/SDL_Keycode
  */
 int
 keyboard_getScancodeFromKey(void *arg)
@@ -533,8 +533,8 @@ keyboard_getScancodeFromKey(void *arg)
 /**
  * @brief Check call to SDL_GetScancodeFromName
  *
- * @sa http://wiki.libsdl.org/moin.cgi/SDL_GetScancodeFromName
- * @sa http://wiki.libsdl.org/moin.cgi/SDL_Keycode
+ * @sa http://wiki.libsdl.org/SDL_GetScancodeFromName
+ * @sa http://wiki.libsdl.org/SDL_Keycode
  */
 int
 keyboard_getScancodeFromName(void *arg)
@@ -606,8 +606,8 @@ _checkInvalidNameError()
 /**
  * @brief Check call to SDL_GetScancodeFromName with invalid data
  *
- * @sa http://wiki.libsdl.org/moin.cgi/SDL_GetScancodeFromName
- * @sa http://wiki.libsdl.org/moin.cgi/SDL_Keycode
+ * @sa http://wiki.libsdl.org/SDL_GetScancodeFromName
+ * @sa http://wiki.libsdl.org/SDL_Keycode
  */
 int
 keyboard_getScancodeFromNameNegative(void *arg)
diff --git a/test/testautomation_main.c b/test/testautomation_main.c
index ae060cdd1..229f2bc55 100644
--- a/test/testautomation_main.c
+++ b/test/testautomation_main.c
@@ -13,8 +13,8 @@
 /* !
  * \brief Tests SDL_Init() and SDL_Quit() of Joystick and Haptic subsystems
  * \sa
- * http://wiki.libsdl.org/moin.cgi/SDL_Init
- * http://wiki.libsdl.org/moin.cgi/SDL_Quit
+ * http://wiki.libsdl.org/SDL_Init
+ * http://wiki.libsdl.org/SDL_Quit
  */
 static int main_testInitQuitJoystickHaptic (void *arg)
 {
@@ -41,8 +41,8 @@ static int main_testInitQuitJoystickHaptic (void *arg)
 /* !
  * \brief Tests SDL_InitSubSystem() and SDL_QuitSubSystem()
  * \sa
- * http://wiki.libsdl.org/moin.cgi/SDL_Init
- * http://wiki.libsdl.org/moin.cgi/SDL_Quit
+ * http://wiki.libsdl.org/SDL_Init
+ * http://wiki.libsdl.org/SDL_Quit
  */
 static int main_testInitQuitSubSystem (void *arg)
 {
diff --git a/test/testautomation_mouse.c b/test/testautomation_mouse.c
index ed30f2604..ee4124266 100644
--- a/test/testautomation_mouse.c
+++ b/test/testautomation_mouse.c
@@ -192,8 +192,8 @@ static SDL_Cursor *_initArrowCursor(const char *image[])
 /**
  * @brief Check call to SDL_CreateCursor and SDL_FreeCursor
  *
- * @sa http://wiki.libsdl.org/moin.cgi/SDL_CreateCursor
- * @sa http://wiki.libsdl.org/moin.cgi/SDL_FreeCursor
+ * @sa http://wiki.libsdl.org/SDL_CreateCursor
+ * @sa http://wiki.libsdl.org/SDL_FreeCursor
  */
 int
 mouse_createFreeCursor(void *arg)
@@ -218,8 +218,8 @@ mouse_createFreeCursor(void *arg)
 /**
  * @brief Check call to SDL_CreateColorCursor and SDL_FreeCursor
  *
- * @sa http://wiki.libsdl.org/moin.cgi/SDL_CreateColorCursor
- * @sa http://wiki.libsdl.org/moin.cgi/SDL_FreeCursor
+ * @sa http://wiki.libsdl.org/SDL_CreateColorCursor
+ * @sa http://wiki.libsdl.org/SDL_FreeCursor
  */
 int
 mouse_createFreeColorCursor(void *arg)
@@ -275,7 +275,7 @@ void _changeCursorVisibility(int state)
 /**
  * @brief Check call to SDL_ShowCursor
  *
- * @sa http://wiki.libsdl.org/moin.cgi/SDL_ShowCursor
+ * @sa http://wiki.libsdl.org/SDL_ShowCursor
  */
 int
 mouse_showCursor(void *arg)
@@ -305,7 +305,7 @@ mouse_showCursor(void *arg)
 /**
  * @brief Check call to SDL_SetCursor
  *
- * @sa http://wiki.libsdl.org/moin.cgi/SDL_SetCursor
+ * @sa http://wiki.libsdl.org/SDL_SetCursor
  */
 int
 mouse_setCursor(void *arg)
@@ -338,7 +338,7 @@ mouse_setCursor(void *arg)
 /**
  * @brief Check call to SDL_GetCursor
  *
- * @sa http://wiki.libsdl.org/moin.cgi/SDL_GetCursor
+ * @sa http://wiki.libsdl.org/SDL_GetCursor
  */
 int
 mouse_getCursor(void *arg)
@@ -356,8 +356,8 @@ mouse_getCursor(void *arg)
 /**
  * @brief Check call to SDL_GetRelativeMouseMode and SDL_SetRelativeMouseMode
  *
- * @sa http://wiki.libsdl.org/moin.cgi/SDL_GetRelativeMouseMode
- * @sa http://wiki.libsdl.org/moin.cgi/SDL_SetRelativeMouseMode
+ * @sa http://wiki.libsdl.org/SDL_GetRelativeMouseMode
+ * @sa http://wiki.libsdl.org/SDL_SetRelativeMouseMode
  */
 int
 mouse_getSetRelativeMouseMode(void *arg)
@@ -440,7 +440,7 @@ void _destroyMouseSuiteTestWindow(SDL_Window *window)
 /**
  * @brief Check call to SDL_WarpMouseInWindow
  *
- * @sa http://wiki.libsdl.org/moin.cgi/SDL_WarpMouseInWindow
+ * @sa http://wiki.libsdl.org/SDL_WarpMouseInWindow
  */
 int
 mouse_warpMouseInWindow(void *arg)
@@ -502,7 +502,7 @@ mouse_warpMouseInWindow(void *arg)
 /**
  * @brief Check call to SDL_GetMouseFocus
  *
- * @sa http://wiki.libsdl.org/moin.cgi/SDL_GetMouseFocus
+ * @sa http://wiki.libsdl.org/SDL_GetMouseFocus
  */
 int
 mouse_getMouseFocus(void *arg)
diff --git a/test/testautomation_pixels.c b/test/testautomation_pixels.c
index b54be8699..2ff2d8705 100644
--- a/test/testautomation_pixels.c
+++ b/test/testautomation_pixels.c
@@ -121,8 +121,8 @@ char* _invalidPixelFormatsVerbose[] =
 /**
  * @brief Call to SDL_AllocFormat and SDL_FreeFormat
  *
- * @sa http://wiki.libsdl.org/moin.fcg/SDL_AllocFormat
- * @sa http://wiki.libsdl.org/moin.fcg/SDL_FreeFormat
+ * @sa http://wiki.libsdl.org/SDL_AllocFormat
+ * @sa http://wiki.libsdl.org/SDL_FreeFormat
  */
 int
 pixels_allocFreeFormat(void *arg)
@@ -228,7 +228,7 @@ pixels_allocFreeFormat(void *arg)
 /**
  * @brief Call to SDL_GetPixelFormatName
  *
- * @sa http://wiki.libsdl.org/moin.fcg/SDL_GetPixelFormatName
+ * @sa http://wiki.libsdl.org/SDL_GetPixelFormatName
  */
 int
 pixels_getPixelFormatName(void *arg)
@@ -312,8 +312,8 @@ pixels_getPixelFormatName(void *arg)
 /**
  * @brief Call to SDL_AllocPalette and SDL_FreePalette
  *
- * @sa http://wiki.libsdl.org/moin.fcg/SDL_AllocPalette
- * @sa http://wiki.libsdl.org/moin.fcg/SDL_FreePalette
+ * @sa http://wiki.libsdl.org/SDL_AllocPalette
+ * @sa http://wiki.libsdl.org/SDL_FreePalette
  */
 int
 pixels_allocFreePalette(void *arg)
@@ -402,7 +402,7 @@ pixels_allocFreePalette(void *arg)
 /**
  * @brief Call to SDL_CalculateGammaRamp
  *
- * @sa http://wiki.libsdl.org/moin.fcg/SDL_CalculateGammaRamp
+ * @sa http://wiki.libsdl.org/SDL_CalculateGammaRamp
  */
 int
 pixels_calcGammaRamp(void *arg)
diff --git a/test/testautomation_platform.c b/test/testautomation_platform.c
index 2280f2436..5e0971f0e 100644
--- a/test/testautomation_platform.c
+++ b/test/testautomation_platform.c
@@ -101,11 +101,11 @@ int platform_testEndianessAndSwap(void *arg)
 /* !
  * \brief Tests SDL_GetXYZ() functions
  * \sa
- * http://wiki.libsdl.org/moin.cgi/SDL_GetPlatform
- * http://wiki.libsdl.org/moin.cgi/SDL_GetCPUCount
- * http://wiki.libsdl.org/moin.cgi/SDL_GetCPUCacheLineSize
- * http://wiki.libsdl.org/moin.cgi/SDL_GetRevision
- * http://wiki.libsdl.org/moin.cgi/SDL_GetRevisionNumber
+ * http://wiki.libsdl.org/SDL_GetPlatform
+ * http://wiki.libsdl.org/SDL_GetCPUCount
+ * http://wiki.libsdl.org/SDL_GetCPUCacheLineSize
+ * http://wiki.libsdl.org/SDL_GetRevision
+ * http://wiki.libsdl.org/SDL_GetRevisionNumber
  */
 int platform_testGetFunctions (void *arg)
 {
@@ -147,16 +147,16 @@ int platform_testGetFunctions (void *arg)
 /* !
  * \brief Tests SDL_HasXYZ() functions
  * \sa
- * http://wiki.libsdl.org/moin.cgi/SDL_Has3DNow
- * http://wiki.libsdl.org/moin.cgi/SDL_HasAltiVec
- * http://wiki.libsdl.org/moin.cgi/SDL_HasMMX
- * http://wiki.libsdl.org/moin.cgi/SDL_HasRDTSC
- * http://wiki.libsdl.org/moin.cgi/SDL_HasSSE
- * http://wiki.libsdl.org/moin.cgi/SDL_HasSSE2
- * http://wiki.libsdl.org/moin.cgi/SDL_HasSSE3
- * http://wiki.libsdl.org/moin.cgi/SDL_HasSSE41
- * http://wiki.libsdl.org/moin.cgi/SDL_HasSSE42
- * http://wiki.libsdl.org/moin.cgi/SDL_HasAVX
+ * http://wiki.libsdl.org/SDL_Has3DNow
+ * http://wiki.libsdl.org/SDL_HasAltiVec
+ * http://wiki.libsdl.org/SDL_HasMMX
+ * http://wiki.libsdl.org/SDL_HasRDTSC
+ * http://wiki.libsdl.org/SDL_HasSSE
+ * http://wiki.libsdl.org/SDL_HasSSE2
+ * http://wiki.libsdl.org/SDL_HasSSE3
+ * http://wiki.libsdl.org/SDL_HasSSE41
+ * http://wiki.libsdl.org/SDL_HasSSE42
+ * http://wiki.libsdl.org/SDL_HasAVX
  */
 int platform_testHasFunctions (void *arg)
 {
@@ -198,7 +198,7 @@ int platform_testHasFunctions (void *arg)
 /* !
  * \brief Tests SDL_GetVersion
  * \sa
- * http://wiki.libsdl.org/moin.cgi/SDL_GetVersion
+ * http://wiki.libsdl.org/SDL_GetVersion
  */
 int platform_testGetVersion(void *arg)
 {
@@ -268,9 +268,9 @@ int platform_testDefaultInit(void *arg)
 /* !
  * \brief Tests SDL_Get/Set/ClearError
  * \sa
- * http://wiki.libsdl.org/moin.cgi/SDL_GetError
- * http://wiki.libsdl.org/moin.cgi/SDL_SetError
- * http://wiki.libsdl.org/moin.cgi/SDL_ClearError
+ * http://wiki.libsdl.org/SDL_GetError
+ * http://wiki.libsdl.org/SDL_SetError
+ * http://wiki.libsdl.org/SDL_ClearError
  */
 int platform_testGetSetClearError(void *arg)
 {
@@ -322,7 +322,7 @@ int platform_testGetSetClearError(void *arg)
 /* !
  * \brief Tests SDL_SetError with empty input
  * \sa
- * http://wiki.libsdl.org/moin.cgi/SDL_SetError
+ * http://wiki.libsdl.org/SDL_SetError
  */
 int platform_testSetErrorEmptyInput(void *arg)
 {
@@ -360,7 +360,7 @@ int platform_testSetErrorEmptyInput(void *arg)
 /* !
  * \brief Tests SDL_SetError with invalid input
  * \sa
- * http://wiki.libsdl.org/moin.cgi/SDL_SetError
+ * http://wiki.libsdl.org/SDL_SetError
  */
 int platform_testSetErrorInvalidInput(void *arg)
 {
@@ -443,7 +443,7 @@ int platform_testSetErrorInvalidInput(void *arg)
 /* !
  * \brief Tests SDL_GetPowerInfo
  * \sa
- * http://wiki.libsdl.org/moin.cgi/SDL_GetPowerInfo
+ * http://wiki.libsdl.org/SDL_GetPowerInfo
  */
 int platform_testGetPowerInfo(void *arg)
 {
diff --git a/test/testautomation_rect.c b/test/testautomation_rect.c
index abf19f593..26f03e9bb 100644
--- a/test/testautomation_rect.c
+++ b/test/testautomation_rect.c
@@ -43,7 +43,7 @@ void _validateIntersectRectAndLineResults(
  * \brief Tests SDL_IntersectRectAndLine() clipping cases
  *
  * \sa
- * http://wiki.libsdl.org/moin.cgi/SDL_IntersectRectAndLine
+ * http://wiki.libsdl.org/SDL_IntersectRectAndLine
  */
 int
 rect_testIntersectRectAndLine (void *arg)
@@ -114,7 +114,7 @@ rect_testIntersectRectAndLine (void *arg)
  * \brief Tests SDL_IntersectRectAndLine() non-clipping case line inside
  *
  * \sa
- * http://wiki.libsdl.org/moin.cgi/SDL_IntersectRectAndLine
+ * http://wiki.libsdl.org/SDL_IntersectRectAndLine
  */
 int
 rect_testIntersectRectAndLineInside (void *arg)
@@ -181,7 +181,7 @@ rect_testIntersectRectAndLineInside (void *arg)
  * \brief Tests SDL_IntersectRectAndLine() non-clipping cases outside
  *
  * \sa
- * http://wiki.libsdl.org/moin.cgi/SDL_IntersectRectAndLine
+ * http://wiki.libsdl.org/SDL_IntersectRectAndLine
  */
 int
 rect_testIntersectRectAndLineOutside (void *arg)
@@ -236,7 +236,7 @@ rect_testIntersectRectAndLineOutside (void *arg)
  * \brief Tests SDL_IntersectRectAndLine() with empty rectangle
  *
  * \sa
- * http://wiki.libsdl.org/moin.cgi/SDL_IntersectRectAndLine
+ * http://wiki.libsdl.org/SDL_IntersectRectAndLine
  */
 int
 rect_testIntersectRectAndLineEmpty (void *arg)
@@ -271,7 +271,7 @@ rect_testIntersectRectAndLineEmpty (void *arg)
  * \brief Negative tests against SDL_IntersectRectAndLine() with invalid parameters
  *
  * \sa
- * http://wiki.libsdl.org/moin.cgi/SDL_IntersectRectAndLine
+ * http://wiki.libsdl.org/SDL_IntersectRectAndLine
  */
 int
 rect_testIntersectRectAndLineParam (void *arg)
@@ -412,7 +412,7 @@ void _validateRectEqualsResults(
  * \brief Tests SDL_IntersectRect() with B fully inside A
  *
  * \sa
- * http://wiki.libsdl.org/moin.cgi/SDL_IntersectRect
+ * http://wiki.libsdl.org/SDL_IntersectRect
  */
 int rect_testIntersectRectInside (void *arg)
 {
@@ -440,7 +440,7 @@ int rect_testIntersectRectInside (void *arg)
  * \brief Tests SDL_IntersectRect() with B fully outside A
  *
  * \sa
- * http://wiki.libsdl.org/moin.cgi/SDL_IntersectRect
+ * http://wiki.libsdl.org/SDL_IntersectRect
  */
 int rect_testIntersectRectOutside (void *arg)
 {
@@ -468,7 +468,7 @@ int rect_testIntersectRectOutside (void *arg)
  * \brief Tests SDL_IntersectRect() with B partially intersecting A
  *
  * \sa
- * http://wiki.libsdl.org/moin.cgi/SDL_IntersectRect
+ * http://wiki.libsdl.org/SDL_IntersectRect
  */
 int rect_testIntersectRectPartial (void *arg)
 {
@@ -557,7 +557,7 @@ int rect_testIntersectRectPartial (void *arg)
  * \brief Tests SDL_IntersectRect() with 1x1 pixel sized rectangles
  *
  * \sa
- * http://wiki.libsdl.org/moin.cgi/SDL_IntersectRect
+ * http://wiki.libsdl.org/SDL_IntersectRect
  */
 int rect_testIntersectRectPoint (void *arg)
 {
@@ -604,7 +604,7 @@ int rect_testIntersectRectPoint (void *arg)
  * \brief Tests SDL_IntersectRect() with empty rectangles
  *
  * \sa
- * http://wiki.libsdl.org/moin.cgi/SDL_IntersectRect
+ * http://wiki.libsdl.org/SDL_IntersectRect
  */
 int rect_testIntersectRectEmpty (void *arg)
 {
@@ -676,7 +676,7 @@ int rect_testIntersectRectEmpty (void *arg)
  * \brief Negative tests against SDL_IntersectRect() with invalid parameters
  *
  * \sa
- * http://wiki.libsdl.org/moin.cgi/SDL_IntersectRect
+ * http://wiki.libsdl.org/SDL_IntersectRect
  */
 int rect_testIntersectRectParam(void *arg)
 {
@@ -706,7 +706,7 @@ int rect_testIntersectRectParam(void *arg)
  * \brief Tests SDL_HasIntersection() with B fully inside A
  *
  * \sa
- * http://wiki.libsdl.org/moin.cgi/SDL_HasIntersection
+ * http://wiki.libsdl.org/SDL_HasIntersection
  */
 int rect_testHasIntersectionInside (void *arg)
 {
@@ -733,7 +733,7 @@ int rect_testHasIntersectionInside (void *arg)
  * \brief Tests SDL_HasIntersection() with B fully outside A
  *
  * \sa
- * http://wiki.libsdl.org/moin.cgi/SDL_HasIntersection
+ * http://wiki.libsdl.org/SDL_HasIntersection
  */
 int rect_testHasIntersectionOutside (void *arg)
 {
@@ -760,7 +760,7 @@ int rect_testHasIntersectionOutside (void *arg)
  * \brief Tests SDL_HasIntersection() with B partially intersecting A
  *
  * \sa
- * http://wiki.libsdl.org/moin.cgi/SDL_HasIntersection
+ * http://wiki.libsdl.org/SDL_HasIntersection
  */
 int rect_testHasIntersectionPartial (void *arg)
 {
@@ -827,7 +827,7 @@ int rect_testHasIntersectionPartial (void *arg)
  * \brief Tests SDL_HasIntersection() with 1x1 pixel sized rectangles
  *
  * \sa
- * http://wiki.libsdl.org/moin.cgi/SDL_HasIntersection
+ * http://wiki.libsdl.org/SDL_HasIntersection
  */
 int rect_testHasIntersectionPoint (void *arg)
 {
@@ -873,7 +873,7 @@ int rect_testHasIntersectionPoint (void *arg)
  * \brief Tests SDL_HasIntersection() with empty rectangles
  *
  * \sa
- * http://wiki.libsdl.org/moin.cgi/SDL_HasIntersection
+ * http://wiki.libsdl.org/SDL_HasIntersection
  */
 int rect_testHasIntersectionEmpty (void *arg)
 {
@@ -931,7 +931,7 @@ int rect_testHasIntersectionEmpty (void *arg)
  * \brief Negative tests against SDL_HasIntersection() with invalid parameters
  *
  * \sa
- * http://wiki.libsdl.org/moin.cgi/SDL_HasIntersection
+ * http://wiki.libsdl.org/SDL_HasIntersection
  */
 int rect_testHasIntersectionParam(void *arg)
 {
@@ -954,7 +954,7 @@ int rect_testHasIntersectionParam(void *arg)
  * \brief Test SDL_EnclosePoints() without clipping
  *
  * \sa
- * http://wiki.libsdl.org/moin.cgi/SDL_EnclosePoints
+ * http://wiki.libsdl.org/SDL_EnclosePoints
  */
 int rect_testEnclosePoints(void *arg)
 {
@@ -1024,7 +1024,7 @@ int rect_testEnclosePoints(void *arg)
  * \brief Test SDL_EnclosePoints() with repeated input points
  *
  * \sa
- * http://wiki.libsdl.org/moin.cgi/SDL_EnclosePoints
+ * http://wiki.libsdl.org/SDL_EnclosePoints
  */
 int rect_testEnclosePointsRepeatedInput(void *arg)
 {
@@ -1100,7 +1100,7 @@ int rect_testEnclosePointsRepeatedInput(void *arg)
  * \brief Test SDL_EnclosePoints() with clipping
  *
  * \sa
- * http://wiki.libsdl.org/moin.cgi/SDL_EnclosePoints
+ * http://wiki.libsdl.org/SDL_EnclosePoints
  */
 int rect_testEnclosePointsWithClipping(void *arg)
 {
@@ -1199,7 +1199,7 @@ int rect_testEnclosePointsWithClipping(void *arg)
  * \brief Negative tests against SDL_EnclosePoints() with invalid parameters
  *
  * \sa
- * http://wiki.libsdl.org/moin.cgi/SDL_EnclosePoints
+ * http://wiki.libsdl.org/SDL_EnclosePoints
  */
 int rect_testEnclosePointsParam(void *arg)
 {
@@ -1227,7 +1227,7 @@ int rect_testEnclosePointsParam(void *arg)
  * \brief Tests SDL_UnionRect() where rect B is outside rect A
  *
  * \sa
- * http://wiki.libsdl.org/moin.cgi/SDL_UnionRect
+ * http://wiki.libsdl.org/SDL_UnionRect
  */
 int rect_testUnionRectOutside(void *arg)
 {
@@ -1298,7 +1298,7 @@ int rect_testUnionRectOutside(void *arg)
  * \brief Tests SDL_UnionRect() where rect A or rect B are empty
  *
  * \sa
- * http://wiki.libsdl.org/moin.cgi/SDL_UnionRect
+ * http://wiki.libsdl.org/SDL_UnionRect
  */
 int rect_testUnionRectEmpty(void *arg)
 {
@@ -1363,7 +1363,7 @@ int rect_testUnionRectEmpty(void *arg)
  * \brief Tests SDL_UnionRect() where rect B is inside rect A
  *
  * \sa
- * http://wiki.libsdl.org/moin.cgi/SDL_UnionRect
+ * http://wiki.libsdl.org/SDL_UnionRect
  */
 int rect_testUnionRectInside(void *arg)
 {
@@ -1427,7 +1427,7 @@ int rect_testUnionRectInside(void *arg)
  * \brief Negative tests against SDL_UnionRect() with invalid parameters
  *
  * \sa
- * http://wiki.libsdl.org/moin.cgi/SDL_UnionRect
+ * http://wiki.libsdl.org/SDL_UnionRect
  */
 int rect_testUnionRectParam(void *arg)
 {
@@ -1455,7 +1455,7 @@ int rect_testUnionRectParam(void *arg)
  * \brief Tests SDL_RectEmpty() with various inputs
  *
  * \sa
- * http://wiki.libsdl.org/moin.cgi/SDL_RectEmpty
+ * http://wiki.libsdl.org/SDL_RectEmpty
  */
 int rect_testRectEmpty(void *arg)
 {
@@ -1498,7 +1498,7 @@ int rect_testRectEmpty(void *arg)
  * \brief Negative tests against SDL_RectEmpty() with invalid parameters
  *
  * \sa
- * http://wiki.libsdl.org/moin.cgi/SDL_RectEmpty
+ * http://wiki.libsdl.org/SDL_RectEmpty
  */
 int rect_testRectEmptyParam(void *arg)
 {
@@ -1515,7 +1515,7 @@ int rect_testRectEmptyParam(void *arg)
  * \brief Tests SDL_RectEquals() with various inputs
  *
  * \sa
- * http://wiki.libsdl.org/moin.cgi/SDL_RectEquals
+ * http://wiki.libsdl.org/SDL_RectEquals
  */
 int rect_testRectEquals(void *arg)
 {
@@ -1545,7 +1545,7 @@ int rect_testRectEquals(void *arg)
  * \brief Negative tests against SDL_RectEquals() with invalid parameters
  *
  * \sa
- * http://wiki.libsdl.org/moin.cgi/SDL_RectEquals
+ * http://wiki.libsdl.org/SDL_RectEquals
  */
 int rect_testRectEqualsParam(void *arg)
 {
@@ -1678,7 +1678,7 @@ static const SDLTest_TestCaseReference rectTest29 =
  * \brief Sequence of Rect test cases; functions that handle simple rectangles including overlaps and merges.
  *
  * \sa
- * http://wiki.libsdl.org/moin.cgi/CategoryRect
+ * http://wiki.libsdl.org/CategoryRect
  */
 static const SDLTest_TestCaseReference *rectTests[] =  {
     &rectTest1, &rectTest2, &rectTest3, &rectTest4, &rectTest5, &rectTest6, &rectTest7, &rectTest8, &rectTest9, &rectTest10, &rectTest11, &rectTest12, &rectTest13, &rectTest14,
diff --git a/test/testautomation_render.c b/test/testautomation_render.c
index 5a1bc9b8c..42fc54dee 100644
--- a/test/testautomation_render.c
+++ b/test/testautomation_render.c
@@ -83,7 +83,7 @@ void CleanupDestroyRenderer(void *arg)
  * @brief Tests call to SDL_GetNumRenderDrivers
  *
  * \sa
- * http://wiki.libsdl.org/moin.cgi/SDL_GetNumRenderDrivers
+ * http://wiki.libsdl.org/SDL_GetNumRenderDrivers
  */
 int
 render_testGetNumRenderDrivers(void *arg)
@@ -99,9 +99,9 @@ render_testGetNumRenderDrivers(void *arg)
  * @brief Tests the SDL primitives for rendering.
  *
  * \sa
- * http://wiki.libsdl.org/moin.cgi/SDL_SetRenderDrawColor
- * http://wiki.libsdl.org/moin.cgi/SDL_RenderFillRect
- * http://wiki.libsdl.org/moin.cgi/SDL_RenderDrawLine
+ * http://wiki.libsdl.org/SDL_SetRenderDrawColor
+ * http://wiki.libsdl.org/SDL_RenderFillRect
+ * http://wiki.libsdl.org/SDL_RenderDrawLine
  *
  */
 int render_testPrimitives (void *arg)
@@ -206,9 +206,9 @@ int render_testPrimitives (void *arg)
  * @brief Tests the SDL primitives with alpha for rendering.
  *
  * \sa
- * http://wiki.libsdl.org/moin.cgi/SDL_SetRenderDrawColor
- * http://wiki.libsdl.org/moin.cgi/SDL_SetRenderDrawBlendMode
- * http://wiki.libsdl.org/moin.cgi/SDL_RenderFillRect
+ * http://wiki.libsdl.org/SDL_SetRenderDrawColor
+ * http://wiki.libsdl.org/SDL_SetRenderDrawBlendMode
+ * http://wiki.libsdl.org/SDL_RenderFillRect
  */
 int render_testPrimitivesBlend (void *arg)
 {
@@ -355,8 +355,8 @@ int render_testPrimitivesBlend (void *arg)
  * @brief Tests some blitting routines.
  *
  * \sa
- * http://wiki.libsdl.org/moin.cgi/SDL_RenderCopy
- * http://wiki.libsdl.org/moin.cgi/SDL_DestroyTexture
+ * http://wiki.libsdl.org/SDL_RenderCopy
+ * http://wiki.libsdl.org/SDL_DestroyTexture
  */
 int
 render_testBlit(void *arg)
@@ -424,9 +424,9 @@ render_testBlit(void *arg)
  * @brief Blits doing color tests.
  *
  * \sa
- * http://wiki.libsdl.org/moin.cgi/SDL_SetTextureColorMod
- * http://wiki.libsdl.org/moin.cgi/SDL_RenderCopy
- * http://wiki.libsdl.org/moin.cgi/SDL_DestroyTexture
+ * http://wiki.libsdl.org/SDL_SetTextureColorMod
+ * http://wiki.libsdl.org/SDL_RenderCopy
+ * http://wiki.libsdl.org/SDL_DestroyTexture
  */
 int
 render_testBlitColor (void *arg)
@@ -498,9 +498,9 @@ render_testBlitColor (void *arg)
  * @brief Tests blitting with alpha.
  *
  * \sa
- * http://wiki.libsdl.org/moin.cgi/SDL_SetTextureAlphaMod
- * http://wiki.libsdl.org/moin.cgi/SDL_RenderCopy
- * http://wiki.libsdl.org/moin.cgi/SDL_DestroyTexture
+ * http://wiki.libsdl.org/SDL_SetTextureAlphaMod
+ * http://wiki.libsdl.org/SDL_RenderCopy
+ * http://wiki.libsdl.org/SDL_DestroyTexture
  */
 int
 render_testBlitAlpha (void *arg)
@@ -576,8 +576,8 @@ render_testBlitAlpha (void *arg)
  * @brief Tests a blend mode.
  *
  * \sa
- * http://wiki.libsdl.org/moin.cgi/SDL_SetTextureBlendMode
- * http://wiki.libsdl.org/moin.cgi/SDL_RenderCopy
+ * http://wiki.libsdl.org/SDL_SetTextureBlendMode
+ * http://wiki.libsdl.org/SDL_RenderCopy
  */
 static void
 _testBlitBlendMode( SDL_Texture * tface, int mode )
@@ -626,10 +626,10 @@ _testBlitBlendMode( SDL_Texture * tface, int mode )
  * @brief Tests some more blitting routines.
  *
  * \sa
- * http://wiki.libsdl.org/moin.cgi/SDL_SetTextureColorMod
- * http://wiki.libsdl.org/moin.cgi/SDL_SetTextureAlphaMod
- * http://wiki.libsdl.org/moin.cgi/SDL_SetTextureBlendMode
- * http://wiki.libsdl.org/moin.cgi/SDL_DestroyTexture
+ * http://wiki.libsdl.org/SDL_SetTextureColorMod
+ * http://wiki.libsdl.org/SDL_SetTextureAlphaMod
+ * http://wiki.libsdl.org/SDL_SetTextureBlendMode
+ * http://wiki.libsdl.org/SDL_DestroyTexture
  */
 int
 render_testBlitBlend (void *arg)
@@ -779,8 +779,8 @@ _isSupported( int code )
  * @brief Test to see if we can vary the draw color. Helper function.
  *
  * \sa
- * http://wiki.libsdl.org/moin.cgi/SDL_SetRenderDrawColor
- * http://wiki.libsdl.org/moin.cgi/SDL_GetRenderDrawColor
+ * http://wiki.libsdl.org/SDL_SetRenderDrawColor
+ * http://wiki.libsdl.org/SDL_GetRenderDrawColor
  */
 static int
 _hasDrawColor (void)
@@ -817,8 +817,8 @@ _hasDrawColor (void)
  * @brief Test to see if we can vary the blend mode. Helper function.
  *
  * \sa
- * http://wiki.libsdl.org/moin.cgi/SDL_SetRenderDrawBlendMode
- * http://wiki.libsdl.org/moin.cgi/SDL_GetRenderDrawBlendMode
+ * http://wiki.libsdl.org/SDL_SetRenderDrawBlendMode
+ * http://wiki.libsdl.org/SDL_GetRenderDrawBlendMode
  */
 static int
 _hasBlendModes (void)
@@ -874,7 +874,7 @@ _hasBlendModes (void)
  * @brief Loads the test image 'Face' as texture. Helper function.
  *
  * \sa
- * http://wiki.libsdl.org/moin.cgi/SDL_CreateTextureFromSurface
+ * http://wiki.libsdl.org/SDL_CreateTextureFromSurface
  */
 static SDL_Texture *
 _loadTestFace(void)
@@ -902,9 +902,9 @@ _loadTestFace(void)
  * @brief Test to see if can set texture color mode. Helper function.
  *
  * \sa
- * http://wiki.libsdl.org/moin.cgi/SDL_SetTextureColorMod
- * http://wiki.libsdl.org/moin.cgi/SDL_GetTextureColorMod
- * http://wiki.libsdl.org/moin.cgi/SDL_DestroyTexture
+ * http://wiki.libsdl.org/SDL_SetTextureColorMod
+ * http://wiki.libsdl.org/SDL_GetTextureColorMod
+ * http://wiki.libsdl.org/SDL_DestroyTexture
  */
 static int
 _hasTexColor (void)
@@ -942,9 +942,9 @@ _hasTexColor (void)
  * @brief Test to see if we can vary the alpha of the texture. Helper function.
  *
  * \sa
- *  http://wiki.libsdl.org/moin.cgi/SDL_SetTextureAlphaMod
- *  http://wiki.libsdl.org/moin.cgi/SDL_GetTextureAlphaMod
- *  http://wiki.libsdl.org/moin.cgi/SDL_DestroyTexture
+ *  http://wiki.libsdl.org/SDL_SetTextureAlphaMod
+ *  http://wiki.libsdl.org/SDL_GetTextureAlphaMod
+ *  http://wiki.libsdl.org/SDL_DestroyTexture
  */
 static int
 _hasTexAlpha(void)
@@ -984,9 +984,9 @@ _hasTexAlpha(void)
  * @param s Image to compare against.
  *
  * \sa
- * http://wiki.libsdl.org/moin.cgi/SDL_RenderReadPixels
- * http://wiki.libsdl.org/moin.cgi/SDL_CreateRGBSurfaceFrom
- * http://wiki.libsdl.org/moin.cgi/SDL_FreeSurface
+ * http://wiki.libsdl.org/SDL_RenderReadPixels
+ * http://wiki.libsdl.org/SDL_CreateRGBSurfaceFrom
+ * http://wiki.libsdl.org/SDL_FreeSurface
  */
 static void
 _compare(SDL_Surface *referenceSurface, int allowable_error)
@@ -1027,10 +1027,10 @@ _compare(SDL_Surface *referenceSurface, int allowable_error)
  * @brief Clears the screen. Helper function.
  *
  * \sa
- * http://wiki.libsdl.org/moin.cgi/SDL_SetRenderDrawColor
- * http://wiki.libsdl.org/moin.cgi/SDL_RenderClear
- * http://wiki.libsdl.org/moin.cgi/SDL_RenderPresent
- * http://wiki.libsdl.org/moin.cgi/SDL_SetRenderDrawBlendMode
+ * http://wiki.libsdl.org/SDL_SetRenderDrawColor
+ * http://wiki.libsdl.org/SDL_RenderClear
+ * http://wiki.libsdl.org/SDL_RenderPresent
+ * http://wiki.libsdl.org/SDL_SetRenderDrawBlendMode
  */
 static int
 _clearScreen(void)
diff --git a/test/testautomation_rwops.c b/test/testautomation_rwops.c
index b5d5b1d32..a7d3c3272 100644
--- a/test/testautomation_rwops.c
+++ b/test/testautomation_rwops.c
@@ -88,8 +88,8 @@ RWopsTearDown(void *arg)
  * @brief Makes sure parameters work properly. Local helper function.
  *
  * \sa
- * http://wiki.libsdl.org/moin.cgi/SDL_RWseek
- * http://wiki.libsdl.org/moin.cgi/SDL_RWread
+ * http://wiki.libsdl.org/SDL_RWseek
+ * http://wiki.libsdl.org/SDL_RWread
  */
 void
 _testGenericRWopsValidations(SDL_RWops *rw, int write)
@@ -168,7 +168,7 @@ _testGenericRWopsValidations(SDL_RWops *rw, int write)
 /* !
  * Negative test for SDL_RWFromFile parameters
  *
- * \sa http://wiki.libsdl.org/moin.cgi/SDL_RWFromFile
+ * \sa http://wiki.libsdl.org/SDL_RWFromFile
  *
  */
 int
@@ -215,8 +215,8 @@ rwops_testParamNegative (void)
 /**
  * @brief Tests opening from memory.
  *
- * \sa http://wiki.libsdl.org/moin.cgi/SDL_RWFromMem
- * \sa http://wiki.libsdl.org/moin.cgi/SDL_RWClose
+ * \sa http://wiki.libsdl.org/SDL_RWFromMem
+ * \sa http://wiki.libsdl.org/SDL_RWClose
  */
 int
 rwops_testMem (void)
@@ -255,8 +255,8 @@ rwops_testMem (void)
  * @brief Tests opening from memory.
  *
  * \sa
- * http://wiki.libsdl.org/moin.cgi/SDL_RWFromConstMem
- * http://wiki.libsdl.org/moin.cgi/SDL_RWClose
+ * http://wiki.libsdl.org/SDL_RWFromConstMem
+ * http://wiki.libsdl.org/SDL_RWClose
  */
 int
 rwops_testConstMem (void)
@@ -291,8 +291,8 @@ rwops_testConstMem (void)
  * @brief Tests reading from file.
  *
  * \sa
- * http://wiki.libsdl.org/moin.cgi/SDL_RWFromFile
- * http://wiki.libsdl.org/moin.cgi/SDL_RWClose
+ * http://wiki.libsdl.org/SDL_RWFromFile
+ * http://wiki.libsdl.org/SDL_RWClose
  */
 int
 rwops_testFileRead(void)
@@ -338,8 +338,8 @@ rwops_testFileRead(void)
  * @brief Tests writing from file.
  *
  * \sa
- * http://wiki.libsdl.org/moin.cgi/SDL_RWFromFile
- * http://wiki.libsdl.org/moin.cgi/SDL_RWClose
+ * http://wiki.libsdl.org/SDL_RWFromFile
+ * http://wiki.libsdl.org/SDL_RWClose
  */
 int
 rwops_testFileWrite(void)
@@ -386,8 +386,8 @@ rwops_testFileWrite(void)
  * @brief Tests reading from file handle
  *
  * \sa
- * http://wiki.libsdl.org/moin.cgi/SDL_RWFromFP
- * http://wiki.libsdl.org/moin.cgi/SDL_RWClose
+ * http://wiki.libsdl.org/SDL_RWFromFP
+ * http://wiki.libsdl.org/SDL_RWClose
  *
  */
 int
@@ -436,8 +436,8 @@ rwops_testFPRead(void)
  * @brief Tests writing to file handle
  *
  * \sa
- * http://wiki.libsdl.org/moin.cgi/SDL_RWFromFP
- * http://wiki.libsdl.org/moin.cgi/SDL_RWClose
+ * http://wiki.libsdl.org/SDL_RWFromFP
+ * http://wiki.libsdl.org/SDL_RWClose
  *
  */
 int
@@ -484,8 +484,8 @@ rwops_testFPWrite(void)
 /**
  * @brief Tests alloc and free RW context.
  *
- * \sa http://wiki.libsdl.org/moin.cgi/SDL_AllocRW
- * \sa http://wiki.libsdl.org/moin.cgi/SDL_FreeRW
+ * \sa http://wiki.libsdl.org/SDL_AllocRW
+ * \sa http://wiki.libsdl.org/SDL_FreeRW
  */
 int
 rwops_testAllocFree (void)
@@ -511,8 +511,8 @@ rwops_testAllocFree (void)
 /**
  * @brief Compare memory and file reads
  *
- * \sa http://wiki.libsdl.org/moin.cgi/SDL_RWFromMem
- * \sa http://wiki.libsdl.org/moin.cgi/SDL_RWFromFile
+ * \sa http://wiki.libsdl.org/SDL_RWFromMem
+ * \sa http://wiki.libsdl.org/SDL_RWFromFile
  */
 int
 rwops_testCompareRWFromMemWithRWFromFile(void)
@@ -578,10 +578,10 @@ rwops_testCompareRWFromMemWithRWFromFile(void)
  * @brief Tests writing and reading from file using endian aware functions.
  *
  * \sa
- * http://wiki.libsdl.org/moin.cgi/SDL_RWFromFile
- * http://wiki.libsdl.org/moin.cgi/SDL_RWClose
- * http://wiki.libsdl.org/moin.cgi/SDL_ReadBE16
- * http://wiki.libsdl.org/moin.cgi/SDL_WriteBE16
+ * http://wiki.libsdl.org/SDL_RWFromFile
+ * http://wiki.libsdl.org/SDL_RWClose
+ * http://wiki.libsdl.org/SDL_ReadBE16
+ * http://wiki.libsdl.org/SDL_WriteBE16
  */
 int
 rwops_testFileWriteReadEndian(void)
diff --git a/test/testautomation_video.c b/test/testautomation_video.c
index 239390836..342848ac0 100644
--- a/test/testautomation_video.c
+++ b/test/testautomation_video.c
@@ -510,7 +510,7 @@ video_getClosestDisplayModeRandomResolution(void *arg)
 /**
  * @brief Tests call to SDL_GetWindowBrightness
  *
-* @sa http://wiki.libsdl.org/moin.fcg/SDL_GetWindowBrightness
+* @sa http://wiki.libsdl.org/SDL_GetWindowBrightness
  */
 int
 video_getWindowBrightness(void *arg)
@@ -536,7 +536,7 @@ video_getWindowBrightness(void *arg)
 /**
  * @brief Tests call to SDL_GetWindowBrightness with invalid input
  *
-* @sa http://wiki.libsdl.org/moin.fcg/SDL_GetWindowBrightness
+* @sa http://wiki.libsdl.org/SDL_GetWindowBrightness
  */
 int
 video_getWindowBrightnessNegative(void *arg)
@@ -565,7 +565,7 @@ video_getWindowBrightnessNegative(void *arg)
 /**
  * @brief Tests call to SDL_GetWindowDisplayMode
  *
- * @sa http://wiki.libsdl.org/moin.fcg/SDL_GetWindowDisplayMode
+ * @sa http://wiki.libsdl.org/SDL_GetWindowDisplayMode
  */
 int
 video_getWindowDisplayMode(void *arg)
@@ -619,7 +619,7 @@ void _checkInvalidWindowError()
 /**
  * @brief Tests call to SDL_GetWindowDisplayMode with invalid input
  *
- * @sa http://wiki.libsdl.org/moin.fcg/SDL_GetWindowDisplayMode
+ * @sa http://wiki.libsdl.org/SDL_GetWindowDisplayMode
  */
 int
 video_getWindowDisplayModeNegative(void *arg)
@@ -663,7 +663,7 @@ video_getWindowDisplayModeNegative(void *arg)
 /**
  * @brief Tests call to SDL_GetWindowGammaRamp
  *
- * @sa http://wiki.libsdl.org/moin.fcg/SDL_GetWindowGammaRamp
+ * @sa http://wiki.libsdl.org/SDL_GetWindowGammaRamp
  */
 int
 video_getWindowGammaRamp(void *arg)
@@ -724,7 +724,7 @@ video_getWindowGammaRamp(void *arg)
 /**
  * @brief Tests call to SDL_GetWindowGammaRamp with invalid input
  *
-* @sa http://wiki.libsdl.org/moin.fcg/SDL_GetWindowGammaRamp
+* @sa http://wiki.libsdl.org/SDL_GetWindowGammaRamp
  */
 int
 video_getWindowGammaRampNegative(void *arg)
@@ -964,8 +964,8 @@ video_getSetWindowGrab(void *arg)
 /**
  * @brief Tests call to SDL_GetWindowID and SDL_GetWindowFromID
  *
- * @sa http://wiki.libsdl.org/moin.fcg/SDL_GetWindowID
- * @sa http://wiki.libsdl.org/moin.fcg/SDL_SetWindowFromID
+ * @sa http://wiki.libsdl.org/SDL_GetWindowID
+ * @sa http://wiki.libsdl.org/SDL_SetWindowFromID
  */
 int
 video_getWindowId(void *arg)
@@ -1020,7 +1020,7 @@ video_getWindowId(void *arg)
 /**
  * @brief Tests call to SDL_GetWindowPixelFormat
  *
- * @sa http://wiki.libsdl.org/moin.fcg/SDL_GetWindowPixelFormat
+ * @sa http://wiki.libsdl.org/SDL_GetWindowPixelFormat
  */
 int
 video_getWindowPixelFormat(void *arg)
@@ -1054,8 +1054,8 @@ video_getWindowPixelFormat(void *arg)
 /**
  * @brief Tests call to SDL_GetWindowPosition and SDL_SetWindowPosition
  *
- * @sa http://wiki.libsdl.org/moin.fcg/SDL_GetWindowPosition
- * @sa http://wiki.libsdl.org/moin.fcg/SDL_SetWindowPosition
+ * @sa http://wiki.libsdl.org/SDL_GetWindowPosition
+ * @sa http://wiki.libsdl.org/SDL_SetWindowPosition
  */
 int
 video_getSetWindowPosition(void *arg)
@@ -1197,8 +1197,8 @@ void _checkInvalidParameterError()
 /**
  * @brief Tests call to SDL_GetWindowSize and SDL_SetWindowSize
  *
- * @sa http://wiki.libsdl.org/moin.fcg/SDL_GetWindowSize
- * @sa http://wiki.libsdl.org/moin.fcg/SDL_SetWindowSize
+ * @sa http://wiki.libsdl.org/SDL_GetWindowSize
+ * @sa http://wiki.libsdl.org/SDL_SetWindowSize
  */
 int
 video_getSetWindowSize(void *arg)
@@ -1636,8 +1636,8 @@ video_getSetWindowMaximumSize(void *arg)
 /**
  * @brief Tests call to SDL_SetWindowData and SDL_GetWindowData
  *
- * @sa http://wiki.libsdl.org/moin.fcg/SDL_SetWindowData
- * @sa http://wiki.libsdl.org/moin.fcg/SDL_GetWindowData
+ * @sa http://wiki.libsdl.org/SDL_SetWindowData
+ * @sa http://wiki.libsdl.org/SDL_GetWindowData
  */
 int
 video_getSetWindowData(void *arg)