diff --git a/Makefile.am b/Makefile.am
index e9fb74c646..3bf9cbd048 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -300,6 +300,7 @@ library_include_HEADERS = \
 	src/include/switch_dso.h \
 	src/include/switch_loadable_module.h \
 	src/include/switch_module_interfaces.h \
+	src/include/switch_packetizer.h \
 	src/include/switch_platform.h \
 	src/include/switch_resample.h \
 	src/include/switch_regex.h \
diff --git a/src/include/switch.h b/src/include/switch.h
index 9fdbf12aa6..461914c93b 100644
--- a/src/include/switch.h
+++ b/src/include/switch.h
@@ -136,6 +136,7 @@
 #include "switch_core_event_hook.h"
 #include "switch_scheduler.h"
 #include "switch_config.h"
+#include "switch_packetizer.h"
 #include "switch_nat.h"
 #include "switch_odbc.h"
 #include "switch_json.h"
diff --git a/src/include/switch_packetizer.h b/src/include/switch_packetizer.h
index 39cdf4f4d6..b6079d6c08 100644
--- a/src/include/switch_packetizer.h
+++ b/src/include/switch_packetizer.h
@@ -29,8 +29,6 @@
  *
  */
 
-#include <switch.h>
-
 #ifndef SWITCH_PACKETIZER_H
 #define SWITCH_PACKETIZER_H
 
diff --git a/src/mod/applications/mod_av/avformat.c b/src/mod/applications/mod_av/avformat.c
index 96684d3d28..4ae98a1594 100644
--- a/src/mod/applications/mod_av/avformat.c
+++ b/src/mod/applications/mod_av/avformat.c
@@ -54,7 +54,6 @@ GCC_DIAG_OFF(deprecated-declarations)
 #include <libswresample/swresample.h>
 #endif
 
-#include <switch_packetizer.h>
 #define SLICE_SIZE (SWITCH_DEFAULT_VIDEO_SIZE + 100)
 
 GCC_DIAG_ON(deprecated-declarations)
diff --git a/src/switch_packetizer.c b/src/switch_packetizer.c
index e539bd9b59..05688f8a86 100644
--- a/src/switch_packetizer.c
+++ b/src/switch_packetizer.c
@@ -29,7 +29,7 @@
  *
  */
 
-#include <switch_packetizer.h>
+#include <switch.h>
 #define MAX_NALUS 256
 
 typedef struct our_h264_nalu_s {
diff --git a/w32/Library/FreeSwitchCore.2017.vcxproj b/w32/Library/FreeSwitchCore.2017.vcxproj
index a21da723cc..9d7098ee5e 100644
--- a/w32/Library/FreeSwitchCore.2017.vcxproj
+++ b/w32/Library/FreeSwitchCore.2017.vcxproj
@@ -400,6 +400,7 @@ if not exist "$(OutDir)fonts" xcopy "$(SolutionDir)fonts\*.*" "$(OutDir)fonts\"
     <ClCompile Include="..\..\src\switch_odbc.c" />
     <ClCompile Include="..\..\src\switch_pcm.c" />
     <ClCompile Include="..\..\src\switch_speex.c" />
+    <ClCompile Include="..\..\src\switch_packetizer.c" />
     <ClCompile Include="..\..\src\switch_profile.c" />
     <ClCompile Include="..\..\src\switch_regex.c" />
     <ClCompile Include="..\..\src\switch_resample.c" />
@@ -735,6 +736,7 @@ if not exist "$(OutDir)fonts" xcopy "$(SolutionDir)fonts\*.*" "$(OutDir)fonts\"
     <ClInclude Include="..\..\src\include\switch_module_interfaces.h" />
     <ClInclude Include="..\..\src\include\switch_mprintf.h" />
     <ClInclude Include="..\..\src\include\switch_odbc.h" />
+    <ClInclude Include="..\..\src\include\switch_packetizer.h" />
     <ClInclude Include="..\..\src\include\switch_platform.h" />
     <ClInclude Include="..\..\src\include\switch_regex.h" />
     <ClInclude Include="..\..\src\include\switch_resample.h" />