Revert "Fixing header stuff"

This reverts commit dc08eb32e7e97065f053e433cb0d9a3604cd52bd.
Revert "Fix the static calls"

This reverts commit f7fd9464ef1c3156cdde67bc345a764c285deb27.
Revert "Hopefully this will fix the static thing"

This reverts commit 713e85dcafb84d883d1bbf1177b330f7b68ce40b.