diff --git a/docs/documentation/web/Extending_the_HTTP-API.md b/docs/documentation/web/Extending_the_HTTP-API.md
index 8e82078c..41cba6cc 100644
--- a/docs/documentation/web/Extending_the_HTTP-API.md
+++ b/docs/documentation/web/Extending_the_HTTP-API.md
@@ -43,7 +43,7 @@ void handle_HTTP_GET_hello(struct mg_connection *nc, void *hm);
 **```handle_HTTP_GET_hello.c```**
 
 ```c
-#include "civet/CivetServer.h"
+#include "CivetServer.h"
 #include "civet/civetweb.h"
 #include <string.h>
 
diff --git a/docs/documentation/web/Extending_the_WS-API.md b/docs/documentation/web/Extending_the_WS-API.md
index 21da130d..a82c47c4 100644
--- a/docs/documentation/web/Extending_the_WS-API.md
+++ b/docs/documentation/web/Extending_the_WS-API.md
@@ -37,7 +37,7 @@ PURPOSE: (Represent Websocket connection.)
 
 #include <string>
 #ifndef SWIG
-#include "civet/CivetServer.h"
+#include "CivetServer.h"
 #endif
 
 class WebSocketSession {
diff --git a/trick_sims/Cannon/models/cannon/httpMethods/handle_HTTP_GET_hello.c b/trick_sims/Cannon/models/cannon/httpMethods/handle_HTTP_GET_hello.c
index d5293842..6fb38fe5 100644
--- a/trick_sims/Cannon/models/cannon/httpMethods/handle_HTTP_GET_hello.c
+++ b/trick_sims/Cannon/models/cannon/httpMethods/handle_HTTP_GET_hello.c
@@ -1,4 +1,4 @@
-#include "civet/CivetServer.h"
+#include "CivetServer.h"
 
 void handle_HTTP_GET_hello(struct mg_connection *nc, struct http_message *hm) {
     mg_printf(nc, "%s", "HTTP/1.1 200 OK\r\nTransfer-Encoding: chunked\r\n\r\n");
@@ -6,4 +6,4 @@ void handle_HTTP_GET_hello(struct mg_connection *nc, struct http_message *hm) {
         "{ \"greeting\" : \"Hello Trick Sim Developer!\" }";
     mg_printf_http_chunk(nc, "%s", json_text);
     mg_send_http_chunk(nc, "", 0);
-}
\ No newline at end of file
+}
diff --git a/trick_source/web/CivetServer/include/VariableServerSession.hh b/trick_source/web/CivetServer/include/VariableServerSession.hh
index 2c7421c8..36c81078 100644
--- a/trick_source/web/CivetServer/include/VariableServerSession.hh
+++ b/trick_source/web/CivetServer/include/VariableServerSession.hh
@@ -9,7 +9,7 @@ PURPOSE: (Represent the state of a variable server websocket connection.)
 #include <string>
 
 #ifndef SWIG
-#include "civet/CivetServer.h"
+#include "CivetServer.h"
 #endif
 
 #include "trick/WebSocketSession.hh"
diff --git a/trick_source/web/CivetServer/include/http_GET_handlers.hh b/trick_source/web/CivetServer/include/http_GET_handlers.hh
index 28568a64..e8241f00 100644
--- a/trick_source/web/CivetServer/include/http_GET_handlers.hh
+++ b/trick_source/web/CivetServer/include/http_GET_handlers.hh
@@ -8,7 +8,7 @@ LIBRARY DEPENDENCIES:
 #include <cstddef>
 
 #ifndef SWIG
-#include "civet/CivetServer.h"
+#include "CivetServer.h"
 #endif
 
 void http_send(struct mg_connection *conn, const char* msg, int len, int chunk_size);
diff --git a/trick_source/web/CivetServer/src/MyCivetServer.cpp b/trick_source/web/CivetServer/src/MyCivetServer.cpp
index 9c27e8aa..ce230082 100644
--- a/trick_source/web/CivetServer/src/MyCivetServer.cpp
+++ b/trick_source/web/CivetServer/src/MyCivetServer.cpp
@@ -21,7 +21,7 @@ PURPOSE: (Represent the state and initial conditions for my server)
 #include "trick/WebSocketSession.hh"
 
 #ifndef SWIG
-#include "civet/CivetServer.h"
+#include "CivetServer.h"
 #endif
 
 #include "../include/http_GET_handlers.hh"
diff --git a/trick_source/web/CivetServer/src/http_GET_handlers.cpp b/trick_source/web/CivetServer/src/http_GET_handlers.cpp
index d201cc18..ee914522 100644
--- a/trick_source/web/CivetServer/src/http_GET_handlers.cpp
+++ b/trick_source/web/CivetServer/src/http_GET_handlers.cpp
@@ -10,7 +10,7 @@ LIBRARY DEPENDENCIES:
 #include "trick/message_type.h"
 
 #ifndef SWIG
-#include "civet/CivetServer.h"
+#include "CivetServer.h"
 #endif
 
 #include <sstream>