Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKent Mein <mein@cs.umn.edu>2002-12-27 16:11:01 +0300
committerKent Mein <mein@cs.umn.edu>2002-12-27 16:11:01 +0300
commitf1c4f705a19cc9ae306431be7a970712a40a2d9a (patch)
treea0dac6b28132e480266a7d7c2d5f2c75613ca1a1 /source/blender
parentf78de74b202cefa087e9d6d1ac62a6d4f0bcf6eb (diff)
Removed the config.h thing from the .h's in the source dir.
So we should be all set now :) Kent -- mein@cs.umn.edu
Diffstat (limited to 'source/blender')
-rw-r--r--source/blender/avi/AVI_avi.h4
-rw-r--r--source/blender/avi/intern/avi_intern.h4
-rw-r--r--source/blender/avi/intern/avirgb.h4
-rw-r--r--source/blender/avi/intern/endian.h4
-rw-r--r--source/blender/avi/intern/mjpeg.h4
-rw-r--r--source/blender/avi/intern/rgb32.h4
-rw-r--r--source/blender/blenkernel/BKE_action.h4
-rw-r--r--source/blender/blenkernel/BKE_armature.h4
-rw-r--r--source/blender/blenkernel/BKE_bad_level_calls.h4
-rw-r--r--source/blender/blenkernel/BKE_blender.h5
-rw-r--r--source/blender/blenkernel/BKE_bmfont.h4
-rw-r--r--source/blender/blenkernel/BKE_bmfont_types.h4
-rw-r--r--source/blender/blenkernel/BKE_booleanops.h4
-rw-r--r--source/blender/blenkernel/BKE_booleanops_mesh.h4
-rw-r--r--source/blender/blenkernel/BKE_constraint.h4
-rw-r--r--source/blender/blenkernel/BKE_curve.h4
-rw-r--r--source/blender/blenkernel/BKE_deform.h4
-rw-r--r--source/blender/blenkernel/BKE_displist.h4
-rw-r--r--source/blender/blenkernel/BKE_effect.h4
-rw-r--r--source/blender/blenkernel/BKE_endian.h4
-rw-r--r--source/blender/blenkernel/BKE_exotic.h4
-rw-r--r--source/blender/blenkernel/BKE_font.h4
-rw-r--r--source/blender/blenkernel/BKE_global.h4
-rw-r--r--source/blender/blenkernel/BKE_group.h4
-rw-r--r--source/blender/blenkernel/BKE_ika.h4
-rw-r--r--source/blender/blenkernel/BKE_image.h4
-rw-r--r--source/blender/blenkernel/BKE_ipo.h4
-rw-r--r--source/blender/blenkernel/BKE_key.h4
-rw-r--r--source/blender/blenkernel/BKE_lattice.h4
-rw-r--r--source/blender/blenkernel/BKE_library.h4
-rw-r--r--source/blender/blenkernel/BKE_main.h4
-rw-r--r--source/blender/blenkernel/BKE_material.h4
-rw-r--r--source/blender/blenkernel/BKE_mball.h4
-rw-r--r--source/blender/blenkernel/BKE_mesh.h4
-rw-r--r--source/blender/blenkernel/BKE_nla.h4
-rw-r--r--source/blender/blenkernel/BKE_object.h4
-rw-r--r--source/blender/blenkernel/BKE_osa_types.h5
-rw-r--r--source/blender/blenkernel/BKE_packedFile.h4
-rw-r--r--source/blender/blenkernel/BKE_plugin_types.h4
-rw-r--r--source/blender/blenkernel/BKE_property.h4
-rw-r--r--source/blender/blenkernel/BKE_sca.h4
-rw-r--r--source/blender/blenkernel/BKE_scene.h4
-rw-r--r--source/blender/blenkernel/BKE_screen.h5
-rw-r--r--source/blender/blenkernel/BKE_sound.h4
-rw-r--r--source/blender/blenkernel/BKE_subsurf.h4
-rw-r--r--source/blender/blenkernel/BKE_text.h4
-rw-r--r--source/blender/blenkernel/BKE_texture.h4
-rw-r--r--source/blender/blenkernel/BKE_utildefines.h4
-rw-r--r--source/blender/blenkernel/BKE_world.h4
-rw-r--r--source/blender/blenkernel/BKE_writeavi.h4
-rw-r--r--source/blender/blenlib/BLI_arithb.h4
-rw-r--r--source/blender/blenlib/BLI_blenlib.h4
-rw-r--r--source/blender/blenlib/BLI_dynstr.h4
-rw-r--r--source/blender/blenlib/BLI_editVert.h4
-rw-r--r--source/blender/blenlib/BLI_ghash.h4
-rw-r--r--source/blender/blenlib/BLI_gsqueue.h4
-rw-r--r--source/blender/blenlib/BLI_linklist.h4
-rw-r--r--source/blender/blenlib/BLI_memarena.h4
-rw-r--r--source/blender/blenlib/BLI_rand.h4
-rw-r--r--source/blender/blenlib/BLI_storage_types.h4
-rw-r--r--source/blender/blenlib/BLI_vfontdata.h4
-rw-r--r--source/blender/blenlib/BLI_winstuff.h4
-rw-r--r--source/blender/blenlib/MTC_matrixops.h4
-rw-r--r--source/blender/blenlib/MTC_vectorops.h4
-rw-r--r--source/blender/blenlib/PIL_dynlib.h4
-rw-r--r--source/blender/blenlib/PIL_time.h4
-rw-r--r--source/blender/blenlib/intern/BLI_callbacks.h4
-rw-r--r--source/blender/blenlib/intern/BLI_fileops.h4
-rw-r--r--source/blender/blenlib/intern/BLI_scanfill.h4
-rw-r--r--source/blender/blenlib/intern/BLI_storage.h4
-rw-r--r--source/blender/blenlib/intern/BLI_util.h7
-rw-r--r--source/blender/blenloader/BLO_genfile.h4
-rw-r--r--source/blender/blenloader/BLO_readfile.h4
-rw-r--r--source/blender/blenloader/BLO_soundfile.h4
-rw-r--r--source/blender/blenloader/BLO_writefile.h4
-rw-r--r--source/blender/blenloader/intern/genfile.h4
-rw-r--r--source/blender/blenloader/intern/readfile.h4
-rw-r--r--source/blender/blenpluginapi/floatpatch.h4
-rw-r--r--source/blender/blenpluginapi/iff.h4
-rw-r--r--source/blender/blenpluginapi/plugin.h4
-rw-r--r--source/blender/blenpluginapi/util.h4
-rw-r--r--source/blender/bpython/include/BPY_extern.h4
-rw-r--r--source/blender/bpython/include/BPY_objtypes.h4
-rw-r--r--source/blender/bpython/intern/BPY_constobject.h4
-rw-r--r--source/blender/bpython/intern/BPY_csg.h5
-rw-r--r--source/blender/bpython/intern/BPY_listbase_macro.h4
-rw-r--r--source/blender/bpython/intern/BPY_macros.h4
-rw-r--r--source/blender/bpython/intern/BPY_main.h4
-rw-r--r--source/blender/bpython/intern/BPY_modules.h4
-rw-r--r--source/blender/bpython/intern/BPY_tools.h4
-rw-r--r--source/blender/bpython/intern/BPY_types.h4
-rw-r--r--source/blender/bpython/intern/BPY_window.h3
-rw-r--r--source/blender/bpython/intern/api.h5
-rw-r--r--source/blender/bpython/intern/b_import.h4
-rw-r--r--source/blender/bpython/intern/b_interface.h4
-rw-r--r--source/blender/bpython/intern/opy_datablock.h4
-rw-r--r--source/blender/bpython/intern/opy_nmesh.h4
-rw-r--r--source/blender/bpython/intern/opy_vector.h4
-rw-r--r--source/blender/decrypt/BLO_decrypt.h4
-rw-r--r--source/blender/decrypt/BLO_en_de_cryptHeader.h4
-rw-r--r--source/blender/deflate/BLO_deflate.h4
-rw-r--r--source/blender/encrypt/BLO_encrypt.h4
-rw-r--r--source/blender/imbuf/IMB_imbuf.h4
-rw-r--r--source/blender/imbuf/IMB_imbuf_types.h4
-rw-r--r--source/blender/imbuf/intern/IMB_allocimbuf.h4
-rw-r--r--source/blender/imbuf/intern/IMB_amiga.h4
-rw-r--r--source/blender/imbuf/intern/IMB_bitplanes.h4
-rw-r--r--source/blender/imbuf/intern/IMB_bmp.h4
-rw-r--r--source/blender/imbuf/intern/IMB_cmap.h4
-rw-r--r--source/blender/imbuf/intern/IMB_divers.h4
-rw-r--r--source/blender/imbuf/intern/IMB_filter.h4
-rw-r--r--source/blender/imbuf/intern/IMB_ham.h4
-rw-r--r--source/blender/imbuf/intern/IMB_hamx.h4
-rw-r--r--source/blender/imbuf/intern/IMB_iff.h4
-rw-r--r--source/blender/imbuf/intern/IMB_iris.h4
-rw-r--r--source/blender/imbuf/intern/IMB_jpeg.h4
-rw-r--r--source/blender/imbuf/intern/IMB_png.h4
-rw-r--r--source/blender/imbuf/intern/IMB_targa.h4
-rw-r--r--source/blender/imbuf/intern/imbuf.h4
-rw-r--r--source/blender/imbuf/intern/imbuf_patch.h4
-rw-r--r--source/blender/imbuf/intern/matrix.h4
-rw-r--r--source/blender/img/IMG_Api.h4
-rw-r--r--source/blender/img/intern/IMG_BrushRGBA32.h5
-rw-r--r--source/blender/img/intern/IMG_CanvasRGBA32.h4
-rw-r--r--source/blender/img/intern/IMG_Color.h4
-rw-r--r--source/blender/img/intern/IMG_Line.h4
-rw-r--r--source/blender/img/intern/IMG_MemPtr.h4
-rw-r--r--source/blender/img/intern/IMG_Pixmap.h4
-rw-r--r--source/blender/img/intern/IMG_PixmapRGBA32.h4
-rw-r--r--source/blender/img/intern/IMG_Rect.h4
-rw-r--r--source/blender/img/intern/IMG_Types.h4
-rw-r--r--source/blender/include/BDR_drawaction.h4
-rw-r--r--source/blender/include/BDR_drawmesh.h4
-rw-r--r--source/blender/include/BDR_drawobject.h4
-rw-r--r--source/blender/include/BDR_editcurve.h4
-rw-r--r--source/blender/include/BDR_editface.h4
-rw-r--r--source/blender/include/BDR_editmball.h4
-rw-r--r--source/blender/include/BDR_editobject.h4
-rw-r--r--source/blender/include/BDR_isect.h4
-rw-r--r--source/blender/include/BDR_vpaint.h4
-rw-r--r--source/blender/include/BIF_buttons.h4
-rw-r--r--source/blender/include/BIF_drawimage.h4
-rw-r--r--source/blender/include/BIF_drawoops.h4
-rw-r--r--source/blender/include/BIF_drawscene.h4
-rw-r--r--source/blender/include/BIF_drawseq.h4
-rw-r--r--source/blender/include/BIF_drawtext.h4
-rw-r--r--source/blender/include/BIF_editarmature.h4
-rw-r--r--source/blender/include/BIF_editconstraint.h4
-rw-r--r--source/blender/include/BIF_editdeform.h4
-rw-r--r--source/blender/include/BIF_editfont.h4
-rw-r--r--source/blender/include/BIF_editgroup.h4
-rw-r--r--source/blender/include/BIF_editika.h4
-rw-r--r--source/blender/include/BIF_editkey.h4
-rw-r--r--source/blender/include/BIF_editlattice.h4
-rw-r--r--source/blender/include/BIF_editmesh.h4
-rw-r--r--source/blender/include/BIF_editnla.h4
-rw-r--r--source/blender/include/BIF_editoops.h4
-rw-r--r--source/blender/include/BIF_editsca.h4
-rw-r--r--source/blender/include/BIF_editseq.h4
-rw-r--r--source/blender/include/BIF_editsima.h4
-rw-r--r--source/blender/include/BIF_editsound.h4
-rw-r--r--source/blender/include/BIF_editview.h4
-rw-r--r--source/blender/include/BIF_fsmenu.h4
-rw-r--r--source/blender/include/BIF_gl.h4
-rw-r--r--source/blender/include/BIF_glutil.h4
-rw-r--r--source/blender/include/BIF_graphics.h4
-rw-r--r--source/blender/include/BIF_imasel.h4
-rw-r--r--source/blender/include/BIF_interface.h4
-rw-r--r--source/blender/include/BIF_keyval.h4
-rw-r--r--source/blender/include/BIF_mainqueue.h4
-rw-r--r--source/blender/include/BIF_mywindow.h4
-rw-r--r--source/blender/include/BIF_oops.h4
-rw-r--r--source/blender/include/BIF_poseobject.h4
-rw-r--r--source/blender/include/BIF_previewrender.h4
-rw-r--r--source/blender/include/BIF_renderwin.h4
-rw-r--r--source/blender/include/BIF_resources.h4
-rw-r--r--source/blender/include/BIF_scrarea.h4
-rw-r--r--source/blender/include/BIF_screen.h4
-rw-r--r--source/blender/include/BIF_space.h4
-rw-r--r--source/blender/include/BIF_spacetypes.h4
-rw-r--r--source/blender/include/BIF_toets.h4
-rw-r--r--source/blender/include/BIF_toolbox.h4
-rw-r--r--source/blender/include/BIF_usiblender.h4
-rw-r--r--source/blender/include/BIF_writeavicodec.h4
-rw-r--r--source/blender/include/BIF_writeimage.h4
-rw-r--r--source/blender/include/BIF_writemovie.h4
-rw-r--r--source/blender/include/BSE_buttons.h4
-rw-r--r--source/blender/include/BSE_drawimasel.h4
-rw-r--r--source/blender/include/BSE_drawipo.h4
-rw-r--r--source/blender/include/BSE_drawnla.h4
-rw-r--r--source/blender/include/BSE_drawoops.h4
-rw-r--r--source/blender/include/BSE_drawview.h4
-rw-r--r--source/blender/include/BSE_edit.h4
-rw-r--r--source/blender/include/BSE_editaction.h4
-rw-r--r--source/blender/include/BSE_editaction_types.h4
-rw-r--r--source/blender/include/BSE_editipo.h4
-rw-r--r--source/blender/include/BSE_editipo_types.h4
-rw-r--r--source/blender/include/BSE_editnla_types.h4
-rw-r--r--source/blender/include/BSE_filesel.h4
-rw-r--r--source/blender/include/BSE_headerbuttons.h4
-rw-r--r--source/blender/include/BSE_sequence.h4
-rw-r--r--source/blender/include/BSE_trans_types.h4
-rw-r--r--source/blender/include/BSE_types.h4
-rw-r--r--source/blender/include/BSE_view.h4
-rw-r--r--source/blender/include/LOD_DependKludge.h4
-rw-r--r--source/blender/include/TPT_DependKludge.h4
-rw-r--r--source/blender/include/blendef.h4
-rw-r--r--source/blender/include/datatoc.h4
-rw-r--r--source/blender/include/editlattice_ext.h4
-rw-r--r--source/blender/include/interface.h4
-rw-r--r--source/blender/include/ipo.h4
-rw-r--r--source/blender/include/keyed_functions.h4
-rw-r--r--source/blender/include/license_key.h4
-rw-r--r--source/blender/include/mydevice.h4
-rw-r--r--source/blender/include/nla.h4
-rw-r--r--source/blender/include/objfnt.h4
-rw-r--r--source/blender/include/particle_effect.h4
-rw-r--r--source/blender/include/playanim_ext.h4
-rw-r--r--source/blender/inflate/BLO_in_de_flateHeader.h4
-rw-r--r--source/blender/inflate/BLO_inflate.h4
-rw-r--r--source/blender/makesdna/DNA_ID.h4
-rw-r--r--source/blender/makesdna/DNA_action_types.h4
-rw-r--r--source/blender/makesdna/DNA_actuator_types.h4
-rw-r--r--source/blender/makesdna/DNA_armature_types.h4
-rw-r--r--source/blender/makesdna/DNA_camera_types.h4
-rw-r--r--source/blender/makesdna/DNA_constraint_types.h4
-rw-r--r--source/blender/makesdna/DNA_controller_types.h4
-rw-r--r--source/blender/makesdna/DNA_curve_types.h4
-rw-r--r--source/blender/makesdna/DNA_effect_types.h4
-rw-r--r--source/blender/makesdna/DNA_fileglobal_types.h4
-rw-r--r--source/blender/makesdna/DNA_group_types.h4
-rw-r--r--source/blender/makesdna/DNA_ika_types.h5
-rw-r--r--source/blender/makesdna/DNA_image_types.h4
-rw-r--r--source/blender/makesdna/DNA_ipo_types.h4
-rw-r--r--source/blender/makesdna/DNA_key_types.h4
-rw-r--r--source/blender/makesdna/DNA_lamp_types.h4
-rw-r--r--source/blender/makesdna/DNA_lattice_types.h4
-rw-r--r--source/blender/makesdna/DNA_listBase.h4
-rw-r--r--source/blender/makesdna/DNA_material_types.h4
-rw-r--r--source/blender/makesdna/DNA_mesh_types.h4
-rw-r--r--source/blender/makesdna/DNA_meta_types.h5
-rw-r--r--source/blender/makesdna/DNA_nla_types.h4
-rw-r--r--source/blender/makesdna/DNA_object_types.h4
-rw-r--r--source/blender/makesdna/DNA_oops_types.h4
-rw-r--r--source/blender/makesdna/DNA_packedFile_types.h4
-rw-r--r--source/blender/makesdna/DNA_property_types.h4
-rw-r--r--source/blender/makesdna/DNA_radio_types.h4
-rw-r--r--source/blender/makesdna/DNA_scene_types.h4
-rw-r--r--source/blender/makesdna/DNA_screen_types.h4
-rw-r--r--source/blender/makesdna/DNA_scriptlink_types.h4
-rw-r--r--source/blender/makesdna/DNA_sdna_types.h6
-rw-r--r--source/blender/makesdna/DNA_sensor_types.h4
-rw-r--r--source/blender/makesdna/DNA_sequence_types.h4
-rw-r--r--source/blender/makesdna/DNA_sound_types.h4
-rw-r--r--source/blender/makesdna/DNA_space_types.h4
-rw-r--r--source/blender/makesdna/DNA_text_types.h4
-rw-r--r--source/blender/makesdna/DNA_texture_types.h4
-rw-r--r--source/blender/makesdna/DNA_userdef_types.h4
-rw-r--r--source/blender/makesdna/DNA_vec_types.h5
-rw-r--r--source/blender/makesdna/DNA_vfont_types.h4
-rw-r--r--source/blender/makesdna/DNA_view2d_types.h4
-rw-r--r--source/blender/makesdna/DNA_view3d_types.h4
-rw-r--r--source/blender/makesdna/DNA_wave_types.h4
-rw-r--r--source/blender/makesdna/DNA_world_types.h4
-rw-r--r--source/blender/misc/blendertimer.h4
-rw-r--r--source/blender/radiosity/extern/include/radio.h4
-rw-r--r--source/blender/radiosity/extern/include/radio_types.h4
-rw-r--r--source/blender/readblenfile/BLO_readblenfile.h4
-rw-r--r--source/blender/readstreamglue/BLO_keyStore.h4
-rw-r--r--source/blender/readstreamglue/BLO_readStreamErrors.h4
-rw-r--r--source/blender/readstreamglue/BLO_readStreamGlue.h4
-rw-r--r--source/blender/readstreamglue/BLO_sys_types.h4
-rw-r--r--source/blender/readstreamglue/intern/BLO_keyStorePrivate.h4
-rw-r--r--source/blender/readstreamglue/intern/BLO_readStreamGlueLoopBack.h4
-rw-r--r--source/blender/render/extern/include/render.h5
-rw-r--r--source/blender/render/extern/include/render_types.h6
-rw-r--r--source/blender/render/intern/include/RE_DummyShadowBuffer.h4
-rw-r--r--source/blender/render/intern/include/RE_ShadowBuffer.h4
-rw-r--r--source/blender/render/intern/include/RE_basicShadowBuffer.h4
-rw-r--r--source/blender/render/intern/include/RE_callbacks.h4
-rw-r--r--source/blender/render/intern/include/edgeRender.h6
-rw-r--r--source/blender/render/intern/include/envmap.h7
-rw-r--r--source/blender/render/intern/include/errorHandler.h5
-rw-r--r--source/blender/render/intern/include/gammaCorrectionTables.h5
-rw-r--r--source/blender/render/intern/include/initrender.h4
-rw-r--r--source/blender/render/intern/include/jitter.h4
-rw-r--r--source/blender/render/intern/include/old_zbuffer_types.h6
-rw-r--r--source/blender/render/intern/include/outerRenderLoop.h4
-rw-r--r--source/blender/render/intern/include/pixelblending.h5
-rw-r--r--source/blender/render/intern/include/pixelblending_types.h6
-rw-r--r--source/blender/render/intern/include/pixelshading.h7
-rw-r--r--source/blender/render/intern/include/renderHelp.h4
-rw-r--r--source/blender/render/intern/include/renderPreAndPost.h4
-rw-r--r--source/blender/render/intern/include/render_intern.h4
-rw-r--r--source/blender/render/intern/include/rendercore.h4
-rw-r--r--source/blender/render/intern/include/rendercore_int.h4
-rw-r--r--source/blender/render/intern/include/shadbuf.h4
-rw-r--r--source/blender/render/intern/include/shadowBuffer.h4
-rw-r--r--source/blender/render/intern/include/texture.h7
-rw-r--r--source/blender/render/intern/include/vanillaRenderPipe.h4
-rw-r--r--source/blender/render/intern/include/vanillaRenderPipe_int.h4
-rw-r--r--source/blender/render/intern/include/vanillaRenderPipe_types.h4
-rw-r--r--source/blender/render/intern/include/zbuf.h4
-rw-r--r--source/blender/render/intern/include/zbuf_int.h4
-rw-r--r--source/blender/render/intern/include/zbuf_types.h4
-rw-r--r--source/blender/render/intern/include/zbufferdatastruct.h4
-rw-r--r--source/blender/render/intern/include/zbufferdatastruct_types.h4
-rw-r--r--source/blender/renderconverter/RE_renderconverter.h4
-rw-r--r--source/blender/sign/BLO_sign.h4
-rw-r--r--source/blender/src/winlay.h4
-rw-r--r--source/blender/verify/BLO_sign_verify_Header.h4
-rw-r--r--source/blender/verify/BLO_signer_info.h4
-rw-r--r--source/blender/verify/BLO_verify.h4
-rw-r--r--source/blender/writeblenfile/BLO_writeblenfile.h4
-rw-r--r--source/blender/writestreamglue/BLO_getPubKey.h13
-rw-r--r--source/blender/writestreamglue/BLO_writeStreamErrors.h4
-rw-r--r--source/blender/writestreamglue/BLO_writeStreamGlue.h4
-rw-r--r--source/blender/writestreamglue/intern/BLO_dumpFromMemory.h4
318 files changed, 2 insertions, 1313 deletions
diff --git a/source/blender/avi/AVI_avi.h b/source/blender/avi/AVI_avi.h
index 63ae93411de..76442d9d55e 100644
--- a/source/blender/avi/AVI_avi.h
+++ b/source/blender/avi/AVI_avi.h
@@ -56,10 +56,6 @@
#include <stdio.h> /* for FILE */
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
typedef struct _AviChunk {
int fcc;
int size;
diff --git a/source/blender/avi/intern/avi_intern.h b/source/blender/avi/intern/avi_intern.h
index cba06f0d710..189072eba8d 100644
--- a/source/blender/avi/intern/avi_intern.h
+++ b/source/blender/avi/intern/avi_intern.h
@@ -34,10 +34,6 @@
#include <stdio.h> /* for FILE */
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include "MEM_guardedalloc.h"
unsigned int GET_FCC (FILE *fp);
diff --git a/source/blender/avi/intern/avirgb.h b/source/blender/avi/intern/avirgb.h
index 110ffd6be61..03c0682b024 100644
--- a/source/blender/avi/intern/avirgb.h
+++ b/source/blender/avi/intern/avirgb.h
@@ -30,10 +30,6 @@
* ***** END GPL/BL DUAL LICENSE BLOCK *****
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
void *avi_converter_from_avi_rgb (AviMovie *movie, int stream, unsigned char *buffer, int *size);
void *avi_converter_to_avi_rgb (AviMovie *movie, int stream, unsigned char *buffer, int *size);
diff --git a/source/blender/avi/intern/endian.h b/source/blender/avi/intern/endian.h
index 133b397dbbf..907069c1f87 100644
--- a/source/blender/avi/intern/endian.h
+++ b/source/blender/avi/intern/endian.h
@@ -40,10 +40,6 @@
#include <stdio.h>
#include "AVI_avi.h"
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#define AVI_RAW 0
#define AVI_CHUNK 1
#define AVI_LIST 2
diff --git a/source/blender/avi/intern/mjpeg.h b/source/blender/avi/intern/mjpeg.h
index c397d5e0e74..5b7f54a6e42 100644
--- a/source/blender/avi/intern/mjpeg.h
+++ b/source/blender/avi/intern/mjpeg.h
@@ -30,10 +30,6 @@
* ***** END GPL/BL DUAL LICENSE BLOCK *****
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
void *avi_converter_from_mjpeg (AviMovie *movie, int stream, unsigned char *buffer, int *size);
void *avi_converter_to_mjpeg (AviMovie *movie, int stream, unsigned char *buffer, int *size);
diff --git a/source/blender/avi/intern/rgb32.h b/source/blender/avi/intern/rgb32.h
index b35b7cfeb0a..019869c6058 100644
--- a/source/blender/avi/intern/rgb32.h
+++ b/source/blender/avi/intern/rgb32.h
@@ -30,10 +30,6 @@
* ***** END GPL/BL DUAL LICENSE BLOCK *****
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
void *avi_converter_from_rgb32 (AviMovie *movie, int stream, unsigned char *buffer, int *size);
void *avi_converter_to_rgb32 (AviMovie *movie, int stream, unsigned char *buffer, int *size);
diff --git a/source/blender/blenkernel/BKE_action.h b/source/blender/blenkernel/BKE_action.h
index 822d2ac7a92..50a025c5356 100644
--- a/source/blender/blenkernel/BKE_action.h
+++ b/source/blender/blenkernel/BKE_action.h
@@ -40,10 +40,6 @@
#include "DNA_listBase.h"
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
/**
* The following structures are defined in DNA_action_types.h
*/
diff --git a/source/blender/blenkernel/BKE_armature.h b/source/blender/blenkernel/BKE_armature.h
index d7ba1d1f391..7fabacd48ee 100644
--- a/source/blender/blenkernel/BKE_armature.h
+++ b/source/blender/blenkernel/BKE_armature.h
@@ -34,10 +34,6 @@
#ifndef BKE_ARMATURE_H
#define BKE_ARMATURE_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
struct Bone;
struct Main;
struct bArmature;
diff --git a/source/blender/blenkernel/BKE_bad_level_calls.h b/source/blender/blenkernel/BKE_bad_level_calls.h
index 9d574070809..420a915adf6 100644
--- a/source/blender/blenkernel/BKE_bad_level_calls.h
+++ b/source/blender/blenkernel/BKE_bad_level_calls.h
@@ -37,10 +37,6 @@
#ifndef BKE_BAD_LEVEL_CALLS_H
#define BKE_BAD_LEVEL_CALLS_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
/* readfile.c */
struct PluginSeq;
void open_plugin_seq(struct PluginSeq *pis, char *seqname);
diff --git a/source/blender/blenkernel/BKE_blender.h b/source/blender/blenkernel/BKE_blender.h
index 04325de3888..63e25e289c8 100644
--- a/source/blender/blenkernel/BKE_blender.h
+++ b/source/blender/blenkernel/BKE_blender.h
@@ -36,11 +36,6 @@
#ifndef BKE_BLENDER_H
#define BKE_BLENDER_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-
#ifdef __cplusplus
extern "C" {
#endif
diff --git a/source/blender/blenkernel/BKE_bmfont.h b/source/blender/blenkernel/BKE_bmfont.h
index 98398a05af7..0d42b673769 100644
--- a/source/blender/blenkernel/BKE_bmfont.h
+++ b/source/blender/blenkernel/BKE_bmfont.h
@@ -36,10 +36,6 @@
#ifndef BKE_BMFONT_H
#define BKE_BMFONT_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#ifdef __cplusplus
extern "C" {
#endif
diff --git a/source/blender/blenkernel/BKE_bmfont_types.h b/source/blender/blenkernel/BKE_bmfont_types.h
index c6387a8abe9..a3bb43b5ca8 100644
--- a/source/blender/blenkernel/BKE_bmfont_types.h
+++ b/source/blender/blenkernel/BKE_bmfont_types.h
@@ -36,10 +36,6 @@
#ifndef BKE_BMFONT_TYPES_H
#define BKE_BMFONT_TYPES_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#define is_power_of_two(N) ((N ^ (N - 1)) == (2 * N - 1))
/*
Moved to IMB_imbuf_types.h where it will live close to the ImBuf type.
diff --git a/source/blender/blenkernel/BKE_booleanops.h b/source/blender/blenkernel/BKE_booleanops.h
index b28cbdff673..3f0e3dde4ac 100644
--- a/source/blender/blenkernel/BKE_booleanops.h
+++ b/source/blender/blenkernel/BKE_booleanops.h
@@ -32,10 +32,6 @@
#ifndef BKE_BOOLEANOPS_H
#define BKE_BOOLEANOPS_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
struct Mesh;
struct Object;
struct Base;
diff --git a/source/blender/blenkernel/BKE_booleanops_mesh.h b/source/blender/blenkernel/BKE_booleanops_mesh.h
index 3cb1b17f123..7b0e703da04 100644
--- a/source/blender/blenkernel/BKE_booleanops_mesh.h
+++ b/source/blender/blenkernel/BKE_booleanops_mesh.h
@@ -34,10 +34,6 @@
#include "CSG_BooleanOps.h"
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
/**
* Internal mesh structure.
* Safe to copy by value... hopefully.
diff --git a/source/blender/blenkernel/BKE_constraint.h b/source/blender/blenkernel/BKE_constraint.h
index 3cd1c659c9b..8da92f85c89 100644
--- a/source/blender/blenkernel/BKE_constraint.h
+++ b/source/blender/blenkernel/BKE_constraint.h
@@ -33,10 +33,6 @@
#ifndef BKE_CONSTRAINT_H
#define BKE_CONSTRAINT_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
struct bConstraint;
struct Object;
struct ListBase;
diff --git a/source/blender/blenkernel/BKE_curve.h b/source/blender/blenkernel/BKE_curve.h
index 7853301c045..d0a9c1e5c6a 100644
--- a/source/blender/blenkernel/BKE_curve.h
+++ b/source/blender/blenkernel/BKE_curve.h
@@ -34,10 +34,6 @@
#ifndef BKE_CURVE_H
#define BKE_CURVE_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
struct Curve;
struct ListBase;
struct Object;
diff --git a/source/blender/blenkernel/BKE_deform.h b/source/blender/blenkernel/BKE_deform.h
index dbe17c9bb7b..e7494f28fc4 100644
--- a/source/blender/blenkernel/BKE_deform.h
+++ b/source/blender/blenkernel/BKE_deform.h
@@ -38,10 +38,6 @@
#ifndef BKE_DEFORM_H
#define BKE_DEFORM_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
struct Object;
struct ListBase;
struct bDeformGroup;
diff --git a/source/blender/blenkernel/BKE_displist.h b/source/blender/blenkernel/BKE_displist.h
index 7c6df35cdc7..6ea3b8c96f2 100644
--- a/source/blender/blenkernel/BKE_displist.h
+++ b/source/blender/blenkernel/BKE_displist.h
@@ -35,10 +35,6 @@
#ifndef BKE_DISPLIST_H
#define BKE_DISPLIST_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#define DL_POLY 0
#define DL_SEGM 1
#define DL_SURF 2
diff --git a/source/blender/blenkernel/BKE_effect.h b/source/blender/blenkernel/BKE_effect.h
index 08fde218c61..cb3abf9d182 100644
--- a/source/blender/blenkernel/BKE_effect.h
+++ b/source/blender/blenkernel/BKE_effect.h
@@ -34,10 +34,6 @@
#ifndef BKE_EFFECT_H
#define BKE_EFFECT_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
struct Effect;
struct ListBase;
struct Object;
diff --git a/source/blender/blenkernel/BKE_endian.h b/source/blender/blenkernel/BKE_endian.h
index 9503fd4de69..11d39a2ecb6 100644
--- a/source/blender/blenkernel/BKE_endian.h
+++ b/source/blender/blenkernel/BKE_endian.h
@@ -34,10 +34,6 @@
#ifndef BKE_ENDIAN_H
#define BKE_ENDIAN_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#define BKE_ENDIANNESS(a) { \
union { \
long l; \
diff --git a/source/blender/blenkernel/BKE_exotic.h b/source/blender/blenkernel/BKE_exotic.h
index d67fbf85558..a17e9954bc1 100644
--- a/source/blender/blenkernel/BKE_exotic.h
+++ b/source/blender/blenkernel/BKE_exotic.h
@@ -34,10 +34,6 @@
#ifndef BKE_EXOTIC_H
#define BKE_EXOTIC_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
struct Mesh;
void mcol_to_rgba(unsigned int col, float *r, float *g, float *b, float *a);
diff --git a/source/blender/blenkernel/BKE_font.h b/source/blender/blenkernel/BKE_font.h
index 8bad7687499..2f923315aaf 100644
--- a/source/blender/blenkernel/BKE_font.h
+++ b/source/blender/blenkernel/BKE_font.h
@@ -34,10 +34,6 @@
#ifndef BKE_VFONT_H
#define BKE_VFONT_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
struct VFont;
struct Object;
struct Curve;
diff --git a/source/blender/blenkernel/BKE_global.h b/source/blender/blenkernel/BKE_global.h
index bd84f3b7980..27546a7b9a2 100644
--- a/source/blender/blenkernel/BKE_global.h
+++ b/source/blender/blenkernel/BKE_global.h
@@ -38,10 +38,6 @@
#ifndef BKE_GLOBAL_H
#define BKE_GLOBAL_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include "DNA_listBase.h"
#ifdef __cplusplus
diff --git a/source/blender/blenkernel/BKE_group.h b/source/blender/blenkernel/BKE_group.h
index f73c18fd1f1..265d16579c2 100644
--- a/source/blender/blenkernel/BKE_group.h
+++ b/source/blender/blenkernel/BKE_group.h
@@ -34,10 +34,6 @@
#ifndef BKE_GROUP_H
#define BKE_GROUP_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
struct Group;
struct GroupKey;
struct GroupObject;
diff --git a/source/blender/blenkernel/BKE_ika.h b/source/blender/blenkernel/BKE_ika.h
index d962fe8552e..93856c31374 100644
--- a/source/blender/blenkernel/BKE_ika.h
+++ b/source/blender/blenkernel/BKE_ika.h
@@ -34,10 +34,6 @@
#ifndef BKE_IKA_H
#define BKE_IKA_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
struct Ika;
struct Limb;
struct Object;
diff --git a/source/blender/blenkernel/BKE_image.h b/source/blender/blenkernel/BKE_image.h
index 2c34bf2041a..fd278aa5329 100644
--- a/source/blender/blenkernel/BKE_image.h
+++ b/source/blender/blenkernel/BKE_image.h
@@ -34,10 +34,6 @@
#ifndef BKE_IMAGE_H
#define BKE_IMAGE_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#ifdef __cplusplus
extern "C" {
#endif
diff --git a/source/blender/blenkernel/BKE_ipo.h b/source/blender/blenkernel/BKE_ipo.h
index 8826d7fa042..c25163063cc 100644
--- a/source/blender/blenkernel/BKE_ipo.h
+++ b/source/blender/blenkernel/BKE_ipo.h
@@ -34,10 +34,6 @@
#ifndef BKE_IPO_H
#define BKE_IPO_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
typedef struct CfraElem {
struct CfraElem *next, *prev;
float cfra;
diff --git a/source/blender/blenkernel/BKE_key.h b/source/blender/blenkernel/BKE_key.h
index 94269c4482c..481c08cee69 100644
--- a/source/blender/blenkernel/BKE_key.h
+++ b/source/blender/blenkernel/BKE_key.h
@@ -34,10 +34,6 @@
#ifndef BKE_KEY_H
#define BKE_KEY_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
struct Key;
struct KeyBlock;
struct ID;
diff --git a/source/blender/blenkernel/BKE_lattice.h b/source/blender/blenkernel/BKE_lattice.h
index 68df2663943..98bc5a53537 100644
--- a/source/blender/blenkernel/BKE_lattice.h
+++ b/source/blender/blenkernel/BKE_lattice.h
@@ -34,10 +34,6 @@
#ifndef BKE_LATTICE_H
#define BKE_LATTICE_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
struct Lattice;
struct Object;
struct BPoint;
diff --git a/source/blender/blenkernel/BKE_library.h b/source/blender/blenkernel/BKE_library.h
index 910feb75e4e..0331afe580b 100644
--- a/source/blender/blenkernel/BKE_library.h
+++ b/source/blender/blenkernel/BKE_library.h
@@ -36,10 +36,6 @@
#ifndef BKE_LIBRARY_TYPES_H
#define BKE_LIBRARY_TYPES_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
struct ListBase;
struct ID;
struct Main;
diff --git a/source/blender/blenkernel/BKE_main.h b/source/blender/blenkernel/BKE_main.h
index 1b0320a4f16..9afe75898c7 100644
--- a/source/blender/blenkernel/BKE_main.h
+++ b/source/blender/blenkernel/BKE_main.h
@@ -41,10 +41,6 @@
#ifndef BKE_MAIN_H
#define BKE_MAIN_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include "DNA_listBase.h"
struct Library;
diff --git a/source/blender/blenkernel/BKE_material.h b/source/blender/blenkernel/BKE_material.h
index cd4fc3d4474..fcdbed10ffa 100644
--- a/source/blender/blenkernel/BKE_material.h
+++ b/source/blender/blenkernel/BKE_material.h
@@ -34,10 +34,6 @@
#ifndef BKE_MATERIAL_H
#define BKE_MATERIAL_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#ifdef __cplusplus
extern "C" {
#endif
diff --git a/source/blender/blenkernel/BKE_mball.h b/source/blender/blenkernel/BKE_mball.h
index d9f860f7100..b722e84a550 100644
--- a/source/blender/blenkernel/BKE_mball.h
+++ b/source/blender/blenkernel/BKE_mball.h
@@ -34,10 +34,6 @@
#ifndef BKE_MBALL_H
#define BKE_MBALL_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
struct MetaBall;
struct Object;
struct MetaElem;
diff --git a/source/blender/blenkernel/BKE_mesh.h b/source/blender/blenkernel/BKE_mesh.h
index 07681a15bb1..fa1b5b16b1e 100644
--- a/source/blender/blenkernel/BKE_mesh.h
+++ b/source/blender/blenkernel/BKE_mesh.h
@@ -34,10 +34,6 @@
#ifndef BKE_MESH_H
#define BKE_MESH_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
/* texflag */
#define AUTOSPACE 1
diff --git a/source/blender/blenkernel/BKE_nla.h b/source/blender/blenkernel/BKE_nla.h
index 57166968131..9ac6b6ff3af 100644
--- a/source/blender/blenkernel/BKE_nla.h
+++ b/source/blender/blenkernel/BKE_nla.h
@@ -33,10 +33,6 @@
#ifndef BKE_NLA_H
#define BKE_NLA_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
struct bActionStrip;
struct ListBase;
diff --git a/source/blender/blenkernel/BKE_object.h b/source/blender/blenkernel/BKE_object.h
index dd01488151d..fc878140125 100644
--- a/source/blender/blenkernel/BKE_object.h
+++ b/source/blender/blenkernel/BKE_object.h
@@ -34,10 +34,6 @@
#ifndef BKE_OBJECT_H
#define BKE_OBJECT_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#ifdef __cplusplus
extern "C" {
#endif
diff --git a/source/blender/blenkernel/BKE_osa_types.h b/source/blender/blenkernel/BKE_osa_types.h
index c3a6ab63aeb..32f91dd3ff7 100644
--- a/source/blender/blenkernel/BKE_osa_types.h
+++ b/source/blender/blenkernel/BKE_osa_types.h
@@ -34,11 +34,6 @@
#ifndef BKE_OSA_TYPES_H
#define BKE_OSA_TYPES_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-
/* typedef struct Osa */
typedef struct RE_Osa
{
diff --git a/source/blender/blenkernel/BKE_packedFile.h b/source/blender/blenkernel/BKE_packedFile.h
index 99b035120c4..bb605ba55a0 100644
--- a/source/blender/blenkernel/BKE_packedFile.h
+++ b/source/blender/blenkernel/BKE_packedFile.h
@@ -34,10 +34,6 @@
#ifndef BKE_PACKEDFILE_H
#define BKE_PACKEDFILE_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
struct PackedFile;
struct VFont;
struct bSample;
diff --git a/source/blender/blenkernel/BKE_plugin_types.h b/source/blender/blenkernel/BKE_plugin_types.h
index 2934f031495..338cfee7291 100644
--- a/source/blender/blenkernel/BKE_plugin_types.h
+++ b/source/blender/blenkernel/BKE_plugin_types.h
@@ -37,10 +37,6 @@
#ifndef BKE_PLUGIN_TYPES_H
#define BKE_PLUGIN_TYPES_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
struct ImBuf;
typedef int (*TexDoit)(int, void*, float*, float*, float*);
diff --git a/source/blender/blenkernel/BKE_property.h b/source/blender/blenkernel/BKE_property.h
index 980be47e44d..c8af07e3ee8 100644
--- a/source/blender/blenkernel/BKE_property.h
+++ b/source/blender/blenkernel/BKE_property.h
@@ -34,10 +34,6 @@
#ifndef BKE_PROPERTY_H
#define BKE_PROPERTY_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
struct bProperty;
struct ListBase;
struct Object;
diff --git a/source/blender/blenkernel/BKE_sca.h b/source/blender/blenkernel/BKE_sca.h
index b56cfde72d6..62ed06665fe 100644
--- a/source/blender/blenkernel/BKE_sca.h
+++ b/source/blender/blenkernel/BKE_sca.h
@@ -34,10 +34,6 @@
#ifndef BKE_SCA_H
#define BKE_SCA_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
struct Text;
struct bSensor;
struct Object;
diff --git a/source/blender/blenkernel/BKE_scene.h b/source/blender/blenkernel/BKE_scene.h
index 5ae2903f363..a278cc0cfb1 100644
--- a/source/blender/blenkernel/BKE_scene.h
+++ b/source/blender/blenkernel/BKE_scene.h
@@ -34,10 +34,6 @@
#ifndef BKE_SCENE_H
#define BKE_SCENE_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
struct Scene;
struct Object;
struct Base;
diff --git a/source/blender/blenkernel/BKE_screen.h b/source/blender/blenkernel/BKE_screen.h
index ddd4c5bc07c..e20b00a00e7 100644
--- a/source/blender/blenkernel/BKE_screen.h
+++ b/source/blender/blenkernel/BKE_screen.h
@@ -34,12 +34,7 @@
#ifndef BKE_SCREEN_H
#define BKE_SCREEN_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
void free_screen(struct bScreen *sc);
-
#endif
diff --git a/source/blender/blenkernel/BKE_sound.h b/source/blender/blenkernel/BKE_sound.h
index 3a7f8fb4bb1..e6634bc4a6a 100644
--- a/source/blender/blenkernel/BKE_sound.h
+++ b/source/blender/blenkernel/BKE_sound.h
@@ -34,10 +34,6 @@
#ifndef BKE_SOUND_H
#define BKE_SOUND_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
struct PackedFile;
struct bSound;
struct bSample;
diff --git a/source/blender/blenkernel/BKE_subsurf.h b/source/blender/blenkernel/BKE_subsurf.h
index 3eacdc7fead..2ce3a8b66ed 100644
--- a/source/blender/blenkernel/BKE_subsurf.h
+++ b/source/blender/blenkernel/BKE_subsurf.h
@@ -31,10 +31,6 @@
#ifndef BKE_SUBSURF_H
#define BKE_SUBSURF_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
struct Mesh;
struct Object;
struct Displist;
diff --git a/source/blender/blenkernel/BKE_text.h b/source/blender/blenkernel/BKE_text.h
index 906132f7b50..c44b1c37e50 100644
--- a/source/blender/blenkernel/BKE_text.h
+++ b/source/blender/blenkernel/BKE_text.h
@@ -34,10 +34,6 @@
#ifndef BKE_TEXT_H
#define BKE_TEXT_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#ifdef __cplusplus
extern "C" {
#endif
diff --git a/source/blender/blenkernel/BKE_texture.h b/source/blender/blenkernel/BKE_texture.h
index 5c0cecfa2c9..711ad893486 100644
--- a/source/blender/blenkernel/BKE_texture.h
+++ b/source/blender/blenkernel/BKE_texture.h
@@ -34,10 +34,6 @@
#ifndef BKE_TEXTURE_H
#define BKE_TEXTURE_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
struct Tex;
struct MTex;
struct PluginTex;
diff --git a/source/blender/blenkernel/BKE_utildefines.h b/source/blender/blenkernel/BKE_utildefines.h
index 7879d9c9984..d0f418ec192 100644
--- a/source/blender/blenkernel/BKE_utildefines.h
+++ b/source/blender/blenkernel/BKE_utildefines.h
@@ -36,10 +36,6 @@
#ifndef BKE_UTILDEFINES_H
#define BKE_UTILDEFINES_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#ifndef FALSE
#define FALSE 0
#endif
diff --git a/source/blender/blenkernel/BKE_world.h b/source/blender/blenkernel/BKE_world.h
index f20a1e605e3..cedff61f2dd 100644
--- a/source/blender/blenkernel/BKE_world.h
+++ b/source/blender/blenkernel/BKE_world.h
@@ -34,10 +34,6 @@
#ifndef BKE_WORLD_H
#define BKE_WORLD_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
struct World;
void free_world(struct World *sc);
diff --git a/source/blender/blenkernel/BKE_writeavi.h b/source/blender/blenkernel/BKE_writeavi.h
index c76cfad959b..f63342ea047 100644
--- a/source/blender/blenkernel/BKE_writeavi.h
+++ b/source/blender/blenkernel/BKE_writeavi.h
@@ -33,10 +33,6 @@
#ifndef BKE_WRITEAVI_H
#define BKE_WRITEAVI_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#ifdef __cplusplus
extern "C" {
#endif
diff --git a/source/blender/blenlib/BLI_arithb.h b/source/blender/blenlib/BLI_arithb.h
index 230b096dd37..58d3748cd2c 100644
--- a/source/blender/blenlib/BLI_arithb.h
+++ b/source/blender/blenlib/BLI_arithb.h
@@ -40,10 +40,6 @@
#ifndef BLI_ARITHB_H
#define BLI_ARITHB_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#ifdef __cplusplus
extern "C" {
#endif
diff --git a/source/blender/blenlib/BLI_blenlib.h b/source/blender/blenlib/BLI_blenlib.h
index 9d96fc0057a..b5dbf002b84 100644
--- a/source/blender/blenlib/BLI_blenlib.h
+++ b/source/blender/blenlib/BLI_blenlib.h
@@ -65,10 +65,6 @@
#ifndef BLI_BLENLIB_H
#define BLI_BLENLIB_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include "DNA_listBase.h" /* braindamage for the masses... needed
because fillvlakbase and fillvertbase are
used outside */
diff --git a/source/blender/blenlib/BLI_dynstr.h b/source/blender/blenlib/BLI_dynstr.h
index 2a1011d4371..7e8cc140964 100644
--- a/source/blender/blenlib/BLI_dynstr.h
+++ b/source/blender/blenlib/BLI_dynstr.h
@@ -41,10 +41,6 @@
#ifndef BLI_DYNSTR_H
#define BLI_DYNSTR_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
struct DynStr;
/** The abstract DynStr type */
diff --git a/source/blender/blenlib/BLI_editVert.h b/source/blender/blenlib/BLI_editVert.h
index 60c72282582..8dcb19ab214 100644
--- a/source/blender/blenlib/BLI_editVert.h
+++ b/source/blender/blenlib/BLI_editVert.h
@@ -38,10 +38,6 @@
#ifndef BLI_EDITVERT_H
#define BLI_EDITVERT_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
typedef struct EditVert
{
struct EditVert *next, *prev, *vn;
diff --git a/source/blender/blenlib/BLI_ghash.h b/source/blender/blenlib/BLI_ghash.h
index 61ce3d6ffc6..11dee5df57d 100644
--- a/source/blender/blenlib/BLI_ghash.h
+++ b/source/blender/blenlib/BLI_ghash.h
@@ -35,10 +35,6 @@
#ifndef BLI_GHASH_H
#define BLI_GHASH_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
struct GHash;
typedef struct GHash GHash;
diff --git a/source/blender/blenlib/BLI_gsqueue.h b/source/blender/blenlib/BLI_gsqueue.h
index 93db7871607..3079c5e1f56 100644
--- a/source/blender/blenlib/BLI_gsqueue.h
+++ b/source/blender/blenlib/BLI_gsqueue.h
@@ -36,10 +36,6 @@
#ifndef BLI_GSQUEUE_H
#define BLI_GSQUEUE_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
typedef struct _GSQueue GSQueue;
/**
diff --git a/source/blender/blenlib/BLI_linklist.h b/source/blender/blenlib/BLI_linklist.h
index ce5afd2afae..d0e6effae3d 100644
--- a/source/blender/blenlib/BLI_linklist.h
+++ b/source/blender/blenlib/BLI_linklist.h
@@ -36,10 +36,6 @@
#ifndef BLI_LINKLIST_H
#define BLI_LINKLIST_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
struct MemArena;
typedef void (*LinkNodeFreeFP)(void *link);
diff --git a/source/blender/blenlib/BLI_memarena.h b/source/blender/blenlib/BLI_memarena.h
index 4468ee01018..c00d9b9be51 100644
--- a/source/blender/blenlib/BLI_memarena.h
+++ b/source/blender/blenlib/BLI_memarena.h
@@ -40,10 +40,6 @@
#ifndef BLI_MEMARENA_H
#define BLI_MEMARENA_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
/* A reasonable standard buffer size, big
* enough to not cause much internal fragmentation,
* small enough not to waste resources
diff --git a/source/blender/blenlib/BLI_rand.h b/source/blender/blenlib/BLI_rand.h
index 078a234b147..6513dea8115 100644
--- a/source/blender/blenlib/BLI_rand.h
+++ b/source/blender/blenlib/BLI_rand.h
@@ -36,10 +36,6 @@
#ifndef BLI_RAND_H
#define BLI_RAND_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
/** Seed the random number generator */
void BLI_srand (unsigned int seed);
diff --git a/source/blender/blenlib/BLI_storage_types.h b/source/blender/blenlib/BLI_storage_types.h
index 355aa33ef81..2b756e26f5b 100644
--- a/source/blender/blenlib/BLI_storage_types.h
+++ b/source/blender/blenlib/BLI_storage_types.h
@@ -38,10 +38,6 @@
#include <sys/stat.h>
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#define HDRSIZE 512
#define NAMSIZE 200
diff --git a/source/blender/blenlib/BLI_vfontdata.h b/source/blender/blenlib/BLI_vfontdata.h
index d81126b644f..86aab13e3bc 100644
--- a/source/blender/blenlib/BLI_vfontdata.h
+++ b/source/blender/blenlib/BLI_vfontdata.h
@@ -35,10 +35,6 @@
* ***** END GPL/BL DUAL LICENSE BLOCK *****
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#ifndef BLI_VFONTDATA_H
#define BLI_VFONTDATA_H
diff --git a/source/blender/blenlib/BLI_winstuff.h b/source/blender/blenlib/BLI_winstuff.h
index 0c978f61be4..b09fcbafa8c 100644
--- a/source/blender/blenlib/BLI_winstuff.h
+++ b/source/blender/blenlib/BLI_winstuff.h
@@ -33,10 +33,6 @@
*/
#pragma warning(once: 4761 4305 4244 4018)
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#define WIN32_LEAN_AND_MEAN
#include <windows.h>
diff --git a/source/blender/blenlib/MTC_matrixops.h b/source/blender/blenlib/MTC_matrixops.h
index 8bf43376e0c..a1b9959dab2 100644
--- a/source/blender/blenlib/MTC_matrixops.h
+++ b/source/blender/blenlib/MTC_matrixops.h
@@ -35,10 +35,6 @@
#ifndef MATRIXOPS_H
#define MATRIXOPS_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#ifdef __cplusplus
extern "C" {
#endif
diff --git a/source/blender/blenlib/MTC_vectorops.h b/source/blender/blenlib/MTC_vectorops.h
index d29c49c93b9..e6fb8559abc 100644
--- a/source/blender/blenlib/MTC_vectorops.h
+++ b/source/blender/blenlib/MTC_vectorops.h
@@ -35,10 +35,6 @@
#ifndef VECTOROPS_H
#define VECTOROPS_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
/* ------------------------------------------------------------------------- */
void MTC_diff3Int(int v1[3], int v2[3], int v3[3]);
diff --git a/source/blender/blenlib/PIL_dynlib.h b/source/blender/blenlib/PIL_dynlib.h
index e23a2c3f1ac..26e1b2f9ac4 100644
--- a/source/blender/blenlib/PIL_dynlib.h
+++ b/source/blender/blenlib/PIL_dynlib.h
@@ -32,10 +32,6 @@
#ifndef __PIL_DYNLIB_H__
#define __PIL_DYNLIB_H__
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
typedef struct PILdynlib PILdynlib;
PILdynlib*
diff --git a/source/blender/blenlib/PIL_time.h b/source/blender/blenlib/PIL_time.h
index 585d99aca2d..190a116d658 100644
--- a/source/blender/blenlib/PIL_time.h
+++ b/source/blender/blenlib/PIL_time.h
@@ -36,10 +36,6 @@
#ifndef PIL_TIME_H
#define PIL_TIME_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#ifdef __cplusplus
extern "C" {
#endif
diff --git a/source/blender/blenlib/intern/BLI_callbacks.h b/source/blender/blenlib/intern/BLI_callbacks.h
index daf2c081549..a2c7ccd4bd8 100644
--- a/source/blender/blenlib/intern/BLI_callbacks.h
+++ b/source/blender/blenlib/intern/BLI_callbacks.h
@@ -37,10 +37,6 @@
#ifndef BLI_CALLBACKS_H
#define BLI_CALLBACKS_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
// This is blenlib internal only
void callLocalErrorCallBack(char* msg);
int callLocalInterruptCallBack(void);
diff --git a/source/blender/blenlib/intern/BLI_fileops.h b/source/blender/blenlib/intern/BLI_fileops.h
index 520ece11ff8..622706a32e9 100644
--- a/source/blender/blenlib/intern/BLI_fileops.h
+++ b/source/blender/blenlib/intern/BLI_fileops.h
@@ -39,10 +39,6 @@
#ifndef BLI_FILEOPS_H
#define BLI_FILEOPS_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
char *first_slash(char *string);
/* only for the sane unix world: direct calls to system functions :( */
diff --git a/source/blender/blenlib/intern/BLI_scanfill.h b/source/blender/blenlib/intern/BLI_scanfill.h
index d5156b5b6e8..cc02d76ad69 100644
--- a/source/blender/blenlib/intern/BLI_scanfill.h
+++ b/source/blender/blenlib/intern/BLI_scanfill.h
@@ -37,9 +37,5 @@
#ifndef BLI_SCANFILL_H
#define BLI_SCANFILL_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#endif
diff --git a/source/blender/blenlib/intern/BLI_storage.h b/source/blender/blenlib/intern/BLI_storage.h
index 268f5f4b1fa..5e9c377c410 100644
--- a/source/blender/blenlib/intern/BLI_storage.h
+++ b/source/blender/blenlib/intern/BLI_storage.h
@@ -31,10 +31,6 @@
#ifndef BLI_STORAGE_H
#define BLI_STORAGE_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include "BLI_storage_types.h"
void BLI_adddirstrings(void);
diff --git a/source/blender/blenlib/intern/BLI_util.h b/source/blender/blenlib/intern/BLI_util.h
index 96cc6782cac..b033c89a0c9 100644
--- a/source/blender/blenlib/intern/BLI_util.h
+++ b/source/blender/blenlib/intern/BLI_util.h
@@ -36,17 +36,10 @@
#ifndef BLI_UTIL_H
#define BLI_UTIL_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#define mallocstructN(x,y,name) (x*)MEM_mallocN((y)* sizeof(x),name)
#define callocstructN(x,y,name) (x*)MEM_callocN((y)* sizeof(x),name)
-
struct ListBase;
-/* void addlisttolist(struct ListBase *list1, struct ListBase *list2); */
-
#endif
diff --git a/source/blender/blenloader/BLO_genfile.h b/source/blender/blenloader/BLO_genfile.h
index 5b6d4900d98..fadd81a59cc 100644
--- a/source/blender/blenloader/BLO_genfile.h
+++ b/source/blender/blenloader/BLO_genfile.h
@@ -34,10 +34,6 @@
#ifndef BLO_GENFILE_H
#define BLO_GENFILE_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
int BLO_findstruct_offset(char *structname, char *member);// used by py_main.c
#endif
diff --git a/source/blender/blenloader/BLO_readfile.h b/source/blender/blenloader/BLO_readfile.h
index 5267471af52..c664f7f5354 100644
--- a/source/blender/blenloader/BLO_readfile.h
+++ b/source/blender/blenloader/BLO_readfile.h
@@ -33,10 +33,6 @@
#ifndef BLO_READFILE_H
#define BLO_READFILE_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#ifdef __cplusplus
extern "C" {
#endif
diff --git a/source/blender/blenloader/BLO_soundfile.h b/source/blender/blenloader/BLO_soundfile.h
index 51da3543f83..3a8ff3fcb99 100644
--- a/source/blender/blenloader/BLO_soundfile.h
+++ b/source/blender/blenloader/BLO_soundfile.h
@@ -32,10 +32,6 @@
#ifndef BLO_SOUNDFILE_H
#define BLO_SOUNDFILE_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include "DNA_sound_types.h"
#include "DNA_packedFile_types.h"
diff --git a/source/blender/blenloader/BLO_writefile.h b/source/blender/blenloader/BLO_writefile.h
index 41d8dabeedf..1bbbf7ea4c9 100644
--- a/source/blender/blenloader/BLO_writefile.h
+++ b/source/blender/blenloader/BLO_writefile.h
@@ -34,10 +34,6 @@
#ifndef BLO_WRITEFILE_H
#define BLO_WRITEFILE_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
int BLO_write_file(char *dir, int write_flags, char **error_r);
void BLO_write_runtime(char *file, char *exename);
diff --git a/source/blender/blenloader/intern/genfile.h b/source/blender/blenloader/intern/genfile.h
index 91adbc4070d..e23802958ee 100644
--- a/source/blender/blenloader/intern/genfile.h
+++ b/source/blender/blenloader/intern/genfile.h
@@ -34,10 +34,6 @@
#ifndef GENFILE_H
#define GENFILE_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
struct SDNA;
int dna_findstruct_nr(struct SDNA *sdna, char *str);
diff --git a/source/blender/blenloader/intern/readfile.h b/source/blender/blenloader/intern/readfile.h
index 8122639059a..a052b940c7c 100644
--- a/source/blender/blenloader/intern/readfile.h
+++ b/source/blender/blenloader/intern/readfile.h
@@ -33,10 +33,6 @@
#ifndef READFILE_H
#define READFILE_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
struct OldNewMap;
typedef struct FileData {
diff --git a/source/blender/blenpluginapi/floatpatch.h b/source/blender/blenpluginapi/floatpatch.h
index b494ecdeb1a..d33ab7629e1 100644
--- a/source/blender/blenpluginapi/floatpatch.h
+++ b/source/blender/blenpluginapi/floatpatch.h
@@ -31,10 +31,6 @@
#ifndef FLOATPATCH_H
#define FLOATPATCH_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
/* floating point libs differ at systems... with these defines it comilies at all! */
#ifdef MIPS1
diff --git a/source/blender/blenpluginapi/iff.h b/source/blender/blenpluginapi/iff.h
index 951e0f0de52..5d422e413b4 100644
--- a/source/blender/blenpluginapi/iff.h
+++ b/source/blender/blenpluginapi/iff.h
@@ -34,10 +34,6 @@
#include <sys/types.h>
#include "util.h"
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#define IB_rect (1 << 0)
#define IB_planes (1 << 1)
#define IB_cmap (1 << 2)
diff --git a/source/blender/blenpluginapi/plugin.h b/source/blender/blenpluginapi/plugin.h
index 12864477e4d..59596b8b7df 100644
--- a/source/blender/blenpluginapi/plugin.h
+++ b/source/blender/blenpluginapi/plugin.h
@@ -31,10 +31,6 @@
#ifndef PLUGIN_H
#define PLUGIN_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include "iff.h"
#include "util.h"
#include "floatpatch.h"
diff --git a/source/blender/blenpluginapi/util.h b/source/blender/blenpluginapi/util.h
index a5b7a72ee9d..66540581ba5 100644
--- a/source/blender/blenpluginapi/util.h
+++ b/source/blender/blenpluginapi/util.h
@@ -31,10 +31,6 @@
#ifndef UTIL_H
#define UTIL_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <sys/types.h>
#include <stdlib.h>
#include <string.h>
diff --git a/source/blender/bpython/include/BPY_extern.h b/source/blender/bpython/include/BPY_extern.h
index eba808f6a03..6e92d82e655 100644
--- a/source/blender/bpython/include/BPY_extern.h
+++ b/source/blender/bpython/include/BPY_extern.h
@@ -30,10 +30,6 @@
* ***** END GPL/BL DUAL LICENSE BLOCK *****
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
struct Text;
struct ID;
struct ScriptLink;
diff --git a/source/blender/bpython/include/BPY_objtypes.h b/source/blender/bpython/include/BPY_objtypes.h
index 150905a99dc..f5df73b27b6 100644
--- a/source/blender/bpython/include/BPY_objtypes.h
+++ b/source/blender/bpython/include/BPY_objtypes.h
@@ -30,10 +30,6 @@
* ***** END GPL/BL DUAL LICENSE BLOCK *****
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include "DNA_ID.h"
#include "DNA_listBase.h"
#include "DNA_mesh_types.h"
diff --git a/source/blender/bpython/intern/BPY_constobject.h b/source/blender/bpython/intern/BPY_constobject.h
index a9cdf2517f6..5919c281f84 100644
--- a/source/blender/bpython/intern/BPY_constobject.h
+++ b/source/blender/bpython/intern/BPY_constobject.h
@@ -30,10 +30,6 @@
* ***** END GPL/BL DUAL LICENSE BLOCK *****
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
typedef struct {
PyObject_HEAD
PyObject *dict;
diff --git a/source/blender/bpython/intern/BPY_csg.h b/source/blender/bpython/intern/BPY_csg.h
index e81aca184dc..e01a43c5d24 100644
--- a/source/blender/bpython/intern/BPY_csg.h
+++ b/source/blender/bpython/intern/BPY_csg.h
@@ -30,12 +30,7 @@
* ***** END GPL/BL DUAL LICENSE BLOCK *****
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include "BPY_macros.h"
-
#include "opy_datablock.h"
#include "b_interface.h"
diff --git a/source/blender/bpython/intern/BPY_listbase_macro.h b/source/blender/bpython/intern/BPY_listbase_macro.h
index 44bb0e713f0..cee7f958283 100644
--- a/source/blender/bpython/intern/BPY_listbase_macro.h
+++ b/source/blender/bpython/intern/BPY_listbase_macro.h
@@ -36,10 +36,6 @@
/** example: DEFFUNC_GETLIST(text) defines a method for getting a list
* of text blocks */
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
// Example: _GETLIST(name) -> get_namelist
#define _GETLIST(x) get_##x##list
diff --git a/source/blender/bpython/intern/BPY_macros.h b/source/blender/bpython/intern/BPY_macros.h
index 5d7d11d1831..478e2d2c328 100644
--- a/source/blender/bpython/intern/BPY_macros.h
+++ b/source/blender/bpython/intern/BPY_macros.h
@@ -36,10 +36,6 @@
/* Hint: use gcc -E file.c to see what these macros are expanded in */
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include "api.h" // temporary defines for API version
#include "BPY_listbase_macro.h"
diff --git a/source/blender/bpython/intern/BPY_main.h b/source/blender/bpython/intern/BPY_main.h
index 4b782db1067..fd5ad17eca9 100644
--- a/source/blender/bpython/intern/BPY_main.h
+++ b/source/blender/bpython/intern/BPY_main.h
@@ -31,10 +31,6 @@
*/
// Note: Functions prefixed with BPY_ are called from blenkernel routines */
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include "Python.h" /* The python includes themselves. */
#include "compile.h" /* to give us PyCodeObject */
#include "eval.h" /* for PyEval_EvalCode.h */
diff --git a/source/blender/bpython/intern/BPY_modules.h b/source/blender/bpython/intern/BPY_modules.h
index 48f26e7db8e..f1c91d23bc8 100644
--- a/source/blender/bpython/intern/BPY_modules.h
+++ b/source/blender/bpython/intern/BPY_modules.h
@@ -31,10 +31,6 @@
* these prototypes and init functions should be homogenized
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
extern PyObject *init_blender(void);
extern PyObject *init_py_nmesh(void);
extern PyObject *init_py_draw(void);
diff --git a/source/blender/bpython/intern/BPY_tools.h b/source/blender/bpython/intern/BPY_tools.h
index dad5df92917..ea54e9ef817 100644
--- a/source/blender/bpython/intern/BPY_tools.h
+++ b/source/blender/bpython/intern/BPY_tools.h
@@ -31,10 +31,6 @@
*/
/* tools.c */
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
extern PyObject *BPY_incr_ret (PyObject *ob);
extern PyObject *BPY_err_ret_ob (PyObject *type, char *err);
extern int py_err_ret_int (PyObject *type, char *err);
diff --git a/source/blender/bpython/intern/BPY_types.h b/source/blender/bpython/intern/BPY_types.h
index 565829c5cff..adfcd748f94 100644
--- a/source/blender/bpython/intern/BPY_types.h
+++ b/source/blender/bpython/intern/BPY_types.h
@@ -30,10 +30,6 @@
* API defined Object types
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
extern PyTypeObject PyIpoCurve_Type, PyBezTriple_Type;
extern PyTypeObject Button_Type, Buffer_Type;
extern PyTypeObject NMesh_Type, NMFace_Type, NMVert_Type, NMCol_Type;
diff --git a/source/blender/bpython/intern/BPY_window.h b/source/blender/bpython/intern/BPY_window.h
index 8f8835ccfa7..f47fcccc6c3 100644
--- a/source/blender/bpython/intern/BPY_window.h
+++ b/source/blender/bpython/intern/BPY_window.h
@@ -30,8 +30,5 @@
* ***** END GPL/BL DUAL LICENSE BLOCK *****
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
void window_update_curCamera(Object *camera);
diff --git a/source/blender/bpython/intern/api.h b/source/blender/bpython/intern/api.h
index 8c2489c6f07..f73f43af0d3 100644
--- a/source/blender/bpython/intern/api.h
+++ b/source/blender/bpython/intern/api.h
@@ -34,11 +34,6 @@
* see Makefile
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-
#undef EXPERIMENTAL /* undefine this for release, please :-) */
/* Uncomment this if you want to have the new blender module
diff --git a/source/blender/bpython/intern/b_import.h b/source/blender/bpython/intern/b_import.h
index 5813c436220..ec2bf907a9a 100644
--- a/source/blender/bpython/intern/b_import.h
+++ b/source/blender/bpython/intern/b_import.h
@@ -31,10 +31,6 @@
*/
/* b_import.c */
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
PyObject *importText (char *name);
PyObject *blender_import (PyObject *self, PyObject *args);
void init_ourImport (void);
diff --git a/source/blender/bpython/intern/b_interface.h b/source/blender/bpython/intern/b_interface.h
index eb1a15751ac..c0c0e1f63f4 100644
--- a/source/blender/bpython/intern/b_interface.h
+++ b/source/blender/bpython/intern/b_interface.h
@@ -30,10 +30,6 @@
* ***** END GPL/BL DUAL LICENSE BLOCK *****
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include "DNA_ID.h"
#include "DNA_mesh_types.h"
#include "DNA_view3d_types.h"
diff --git a/source/blender/bpython/intern/opy_datablock.h b/source/blender/bpython/intern/opy_datablock.h
index 3ce7d298cc2..39ffbf50497 100644
--- a/source/blender/bpython/intern/opy_datablock.h
+++ b/source/blender/bpython/intern/opy_datablock.h
@@ -30,10 +30,6 @@
* ***** END GPL/BL DUAL LICENSE BLOCK *****
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include "BSE_edit.h" // for getname_< >_ei()
#include "BKE_global.h"
#include "BKE_main.h"
diff --git a/source/blender/bpython/intern/opy_nmesh.h b/source/blender/bpython/intern/opy_nmesh.h
index 50bdea0b0d1..d8d6f2ae9ee 100644
--- a/source/blender/bpython/intern/opy_nmesh.h
+++ b/source/blender/bpython/intern/opy_nmesh.h
@@ -31,10 +31,6 @@
*/
/* opy_nmesh.c */
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include "DNA_mesh_types.h"
#define NMesh_Check(v) ((v)->ob_type == &NMesh_Type)
diff --git a/source/blender/bpython/intern/opy_vector.h b/source/blender/bpython/intern/opy_vector.h
index 054429d57e3..10535fe5ae2 100644
--- a/source/blender/bpython/intern/opy_vector.h
+++ b/source/blender/bpython/intern/opy_vector.h
@@ -39,10 +39,6 @@
/*****************************/
/* temporar hack for typecasts */
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
typedef float (*Matrix4Ptr)[4];
typedef struct {
PyObject_VAR_HEAD
diff --git a/source/blender/decrypt/BLO_decrypt.h b/source/blender/decrypt/BLO_decrypt.h
index f2dd7efe096..3d2f36b1c3b 100644
--- a/source/blender/decrypt/BLO_decrypt.h
+++ b/source/blender/decrypt/BLO_decrypt.h
@@ -30,10 +30,6 @@
* ***** END GPL/BL DUAL LICENSE BLOCK *****
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#ifndef BLO_DECRYPT_H
#define BLO_DECRYPT_H
diff --git a/source/blender/decrypt/BLO_en_de_cryptHeader.h b/source/blender/decrypt/BLO_en_de_cryptHeader.h
index 61b55748bd1..fd9f634c27e 100644
--- a/source/blender/decrypt/BLO_en_de_cryptHeader.h
+++ b/source/blender/decrypt/BLO_en_de_cryptHeader.h
@@ -31,10 +31,6 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#ifndef BLO_EN_DE_CRYPT_H
#define BLO_EN_DE_CRYPT_H
diff --git a/source/blender/deflate/BLO_deflate.h b/source/blender/deflate/BLO_deflate.h
index 50cd7408598..8d7f9ff07e0 100644
--- a/source/blender/deflate/BLO_deflate.h
+++ b/source/blender/deflate/BLO_deflate.h
@@ -31,10 +31,6 @@
* zlib deflate compression wrapper library interface
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#ifndef BLO_DEFLATE_H
#define BLO_DEFLATE_H
diff --git a/source/blender/encrypt/BLO_encrypt.h b/source/blender/encrypt/BLO_encrypt.h
index 2811eb02a96..22b9e6f6300 100644
--- a/source/blender/encrypt/BLO_encrypt.h
+++ b/source/blender/encrypt/BLO_encrypt.h
@@ -30,10 +30,6 @@
* ***** END GPL/BL DUAL LICENSE BLOCK *****
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#ifndef BLO_ENCRYPT_H
#define BLO_ENCRYPT_H
diff --git a/source/blender/imbuf/IMB_imbuf.h b/source/blender/imbuf/IMB_imbuf.h
index fa59e55d333..100da22019f 100644
--- a/source/blender/imbuf/IMB_imbuf.h
+++ b/source/blender/imbuf/IMB_imbuf.h
@@ -94,10 +94,6 @@
* ***** END GPL/BL DUAL LICENSE BLOCK *****
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#ifndef IMB_IMBUF_H
#define IMB_IMBUF_H
diff --git a/source/blender/imbuf/IMB_imbuf_types.h b/source/blender/imbuf/IMB_imbuf_types.h
index 2b89909c887..80da8ed8258 100644
--- a/source/blender/imbuf/IMB_imbuf_types.h
+++ b/source/blender/imbuf/IMB_imbuf_types.h
@@ -42,10 +42,6 @@
* ***** END GPL/BL DUAL LICENSE BLOCK *****
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#ifndef IMB_IMBUF_TYPES_H
#define IMB_IMBUF_TYPES_H
diff --git a/source/blender/imbuf/intern/IMB_allocimbuf.h b/source/blender/imbuf/intern/IMB_allocimbuf.h
index b5daef3f72b..21dc59a127c 100644
--- a/source/blender/imbuf/intern/IMB_allocimbuf.h
+++ b/source/blender/imbuf/intern/IMB_allocimbuf.h
@@ -35,10 +35,6 @@
#ifndef IMB_ALLOCIMBUF_H
#define IMB_ALLOCIMBUF_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
struct ImBuf;
short imb_addrectImBuf(struct ImBuf * ibuf);
diff --git a/source/blender/imbuf/intern/IMB_amiga.h b/source/blender/imbuf/intern/IMB_amiga.h
index 2b58204f384..eca6b8fbac8 100644
--- a/source/blender/imbuf/intern/IMB_amiga.h
+++ b/source/blender/imbuf/intern/IMB_amiga.h
@@ -35,10 +35,6 @@
#ifndef IMB_AMIGA_H
#define IMB_AMIGA_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
struct ImBuf;
struct ImBuf *imb_loadamiga(int *iffmem,int flags);
diff --git a/source/blender/imbuf/intern/IMB_bitplanes.h b/source/blender/imbuf/intern/IMB_bitplanes.h
index cd0667e8730..77832e19177 100644
--- a/source/blender/imbuf/intern/IMB_bitplanes.h
+++ b/source/blender/imbuf/intern/IMB_bitplanes.h
@@ -35,10 +35,6 @@
#ifndef IMB_BITPLANES_H
#define IMB_BITPLANES_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
struct ImBuf;
void imb_bptolong(struct ImBuf *ibuf);
diff --git a/source/blender/imbuf/intern/IMB_bmp.h b/source/blender/imbuf/intern/IMB_bmp.h
index 5c5dc367e98..112cfe932ce 100644
--- a/source/blender/imbuf/intern/IMB_bmp.h
+++ b/source/blender/imbuf/intern/IMB_bmp.h
@@ -35,10 +35,6 @@
#ifndef IMB_BMP_H
#define IMB_BMP_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
struct ImBuf;
int imb_is_a_bmp(void *buf);
diff --git a/source/blender/imbuf/intern/IMB_cmap.h b/source/blender/imbuf/intern/IMB_cmap.h
index 734bbd627e1..23f5b9f4015 100644
--- a/source/blender/imbuf/intern/IMB_cmap.h
+++ b/source/blender/imbuf/intern/IMB_cmap.h
@@ -35,10 +35,6 @@
#ifndef IMB_CMAP_H
#define IMB_CMAP_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
struct ImBuf;
void imb_makecolarray(struct ImBuf *ibuf, unsigned char *mem, short nocols);
diff --git a/source/blender/imbuf/intern/IMB_divers.h b/source/blender/imbuf/intern/IMB_divers.h
index bab752fb845..196ecf3219b 100644
--- a/source/blender/imbuf/intern/IMB_divers.h
+++ b/source/blender/imbuf/intern/IMB_divers.h
@@ -35,10 +35,6 @@
#ifndef IMB_DIVERS_H
#define IMB_DIVERS_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
struct ImBuf;
void imb_checkncols(struct ImBuf *ibuf);
diff --git a/source/blender/imbuf/intern/IMB_filter.h b/source/blender/imbuf/intern/IMB_filter.h
index 23fec962cb8..7091ee56aa2 100644
--- a/source/blender/imbuf/intern/IMB_filter.h
+++ b/source/blender/imbuf/intern/IMB_filter.h
@@ -35,10 +35,6 @@
#ifndef IMB_FILTER_H
#define IMB_FILTER_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
struct ImBuf;
void imb_filterx(struct ImBuf *ibuf);
diff --git a/source/blender/imbuf/intern/IMB_ham.h b/source/blender/imbuf/intern/IMB_ham.h
index d3b4f783b39..b1b1e7b0c97 100644
--- a/source/blender/imbuf/intern/IMB_ham.h
+++ b/source/blender/imbuf/intern/IMB_ham.h
@@ -35,10 +35,6 @@
#ifndef IMB_HAM_H
#define IMB_HAM_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
struct ImBuf;
short imb_converttoham(struct ImBuf *ibuf);
diff --git a/source/blender/imbuf/intern/IMB_hamx.h b/source/blender/imbuf/intern/IMB_hamx.h
index 934cbb7d8ba..8b7f489964e 100644
--- a/source/blender/imbuf/intern/IMB_hamx.h
+++ b/source/blender/imbuf/intern/IMB_hamx.h
@@ -35,10 +35,6 @@
#ifndef IMB_HAMX_H
#define IMB_HAMX_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
struct ImBuf;
struct ImBuf *imb_loadanim(int *iffmem, int flags);
diff --git a/source/blender/imbuf/intern/IMB_iff.h b/source/blender/imbuf/intern/IMB_iff.h
index e59bb21369e..1dbb193d098 100644
--- a/source/blender/imbuf/intern/IMB_iff.h
+++ b/source/blender/imbuf/intern/IMB_iff.h
@@ -35,10 +35,6 @@
#ifndef IMB_IFF_H
#define IMB_IFF_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
struct ImBuf;
unsigned short imb_start_iff(struct ImBuf *ibuf, int file);
diff --git a/source/blender/imbuf/intern/IMB_iris.h b/source/blender/imbuf/intern/IMB_iris.h
index cd50dcef730..41457e1fadf 100644
--- a/source/blender/imbuf/intern/IMB_iris.h
+++ b/source/blender/imbuf/intern/IMB_iris.h
@@ -35,10 +35,6 @@
#ifndef IMB_IRIS_H
#define IMB_IRIS_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
struct ImBuf;
struct ImBuf *imb_loadiris(unsigned char *mem, int flags);
diff --git a/source/blender/imbuf/intern/IMB_jpeg.h b/source/blender/imbuf/intern/IMB_jpeg.h
index 19afcf6ef59..a673d965a4d 100644
--- a/source/blender/imbuf/intern/IMB_jpeg.h
+++ b/source/blender/imbuf/intern/IMB_jpeg.h
@@ -35,10 +35,6 @@
#ifndef IMB_JPEG_H
#define IMB_JPEG_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
struct ImBuf;
struct jpeg_compress_struct;
diff --git a/source/blender/imbuf/intern/IMB_png.h b/source/blender/imbuf/intern/IMB_png.h
index 13726599450..f876b8204d8 100644
--- a/source/blender/imbuf/intern/IMB_png.h
+++ b/source/blender/imbuf/intern/IMB_png.h
@@ -35,10 +35,6 @@
#ifndef IMB_PNG_H
#define IMB_PNG_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
struct ImBuf;
int imb_is_a_png(void *buf);
diff --git a/source/blender/imbuf/intern/IMB_targa.h b/source/blender/imbuf/intern/IMB_targa.h
index 3d7f39d698e..f1fdf5f4daa 100644
--- a/source/blender/imbuf/intern/IMB_targa.h
+++ b/source/blender/imbuf/intern/IMB_targa.h
@@ -35,10 +35,6 @@
#ifndef IMB_TARGA_H
#define IMB_TARGA_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
struct ImBuf;
int imb_is_a_targa(void *buf);
diff --git a/source/blender/imbuf/intern/imbuf.h b/source/blender/imbuf/intern/imbuf.h
index 575ba463ffd..63679be7f31 100644
--- a/source/blender/imbuf/intern/imbuf.h
+++ b/source/blender/imbuf/intern/imbuf.h
@@ -41,10 +41,6 @@
#include <sys/types.h>
#include <stdio.h>
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#ifndef WIN32
#include <unistd.h>
#endif
diff --git a/source/blender/imbuf/intern/imbuf_patch.h b/source/blender/imbuf/intern/imbuf_patch.h
index 11c556b2ced..e8d8faa14a1 100644
--- a/source/blender/imbuf/intern/imbuf_patch.h
+++ b/source/blender/imbuf/intern/imbuf_patch.h
@@ -38,10 +38,6 @@
#ifndef IMBUF_PATCH_H
#define IMBUF_PATCH_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
/* most of imbuf uses this aloc, and it will disappear soon
* (hopefully) (25-10-2001 nzc) */
#include "MEM_guardedalloc.h"
diff --git a/source/blender/imbuf/intern/matrix.h b/source/blender/imbuf/intern/matrix.h
index 11bb6cb3edf..20127e806a9 100644
--- a/source/blender/imbuf/intern/matrix.h
+++ b/source/blender/imbuf/intern/matrix.h
@@ -32,10 +32,6 @@
* ***** END GPL/BL DUAL LICENSE BLOCK *****
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
/* rgbyuv is identiek aan rgbbeta */
float rgbyuv[4][4]={ /* afgeleid uit videoframer = Y Cr Cb in kopieen van Francois*/
diff --git a/source/blender/img/IMG_Api.h b/source/blender/img/IMG_Api.h
index a641b515e95..74e966bdbf8 100644
--- a/source/blender/img/IMG_Api.h
+++ b/source/blender/img/IMG_Api.h
@@ -36,10 +36,6 @@
#include <stddef.h>
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
typedef void* IMG_BrushPtr;
typedef void* IMG_CanvasPtr;
diff --git a/source/blender/img/intern/IMG_BrushRGBA32.h b/source/blender/img/intern/IMG_BrushRGBA32.h
index 8995a218bc5..4c94131f52a 100644
--- a/source/blender/img/intern/IMG_BrushRGBA32.h
+++ b/source/blender/img/intern/IMG_BrushRGBA32.h
@@ -32,13 +32,8 @@
#ifndef _H_IMG_BrushRGBA32
#define _H_IMG_BrushRGBA32
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include "IMG_PixmapRGBA32.h"
-
/**
* A brush used for drawing in pixmaps.
* The brush is a pixmap as well.
diff --git a/source/blender/img/intern/IMG_CanvasRGBA32.h b/source/blender/img/intern/IMG_CanvasRGBA32.h
index 53743b65a87..fb201202fc1 100644
--- a/source/blender/img/intern/IMG_CanvasRGBA32.h
+++ b/source/blender/img/intern/IMG_CanvasRGBA32.h
@@ -35,10 +35,6 @@
#ifndef _H_IMG_CanvasRGBA32
#define _H_IMG_CanvasRGBA32
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include "IMG_PixmapRGBA32.h"
#include "IMG_BrushRGBA32.h"
diff --git a/source/blender/img/intern/IMG_Color.h b/source/blender/img/intern/IMG_Color.h
index ace2ad06359..8343f55e4f0 100644
--- a/source/blender/img/intern/IMG_Color.h
+++ b/source/blender/img/intern/IMG_Color.h
@@ -35,10 +35,6 @@
#ifndef _H_IMG_Color
#define _H_IMG_Color
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
class IMG_ColorRGBA;
/**
diff --git a/source/blender/img/intern/IMG_Line.h b/source/blender/img/intern/IMG_Line.h
index f0d74258f9b..0eb4a261d5f 100644
--- a/source/blender/img/intern/IMG_Line.h
+++ b/source/blender/img/intern/IMG_Line.h
@@ -35,10 +35,6 @@
#ifndef _H_IMG_Line
#define _H_IMG_Line
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include "IMG_Types.h"
#include <math.h>
diff --git a/source/blender/img/intern/IMG_MemPtr.h b/source/blender/img/intern/IMG_MemPtr.h
index f8576c61fbc..772e7aa9886 100644
--- a/source/blender/img/intern/IMG_MemPtr.h
+++ b/source/blender/img/intern/IMG_MemPtr.h
@@ -37,10 +37,6 @@
#include <stddef.h>
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
/**
* A memory pointer for memory of any type.
* It can be used to avoid memory leaks when allocating memory in constructors.
diff --git a/source/blender/img/intern/IMG_Pixmap.h b/source/blender/img/intern/IMG_Pixmap.h
index c97957375d1..bde5b76e9b3 100644
--- a/source/blender/img/intern/IMG_Pixmap.h
+++ b/source/blender/img/intern/IMG_Pixmap.h
@@ -35,10 +35,6 @@
#ifndef _H_IMG_Pixmap
#define _H_IMG_Pixmap
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include "IMG_Types.h"
#include "IMG_Color.h"
#include "IMG_Rect.h"
diff --git a/source/blender/img/intern/IMG_PixmapRGBA32.h b/source/blender/img/intern/IMG_PixmapRGBA32.h
index ed846524799..71941737132 100644
--- a/source/blender/img/intern/IMG_PixmapRGBA32.h
+++ b/source/blender/img/intern/IMG_PixmapRGBA32.h
@@ -35,10 +35,6 @@
#ifndef _H_IMG_PixmapRGBA32
#define _H_IMG_PixmapRGBA32
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include "IMG_Pixmap.h"
#include "IMG_MemPtr.h"
diff --git a/source/blender/img/intern/IMG_Rect.h b/source/blender/img/intern/IMG_Rect.h
index 8d1d835d308..980c96f11aa 100644
--- a/source/blender/img/intern/IMG_Rect.h
+++ b/source/blender/img/intern/IMG_Rect.h
@@ -35,10 +35,6 @@
#ifndef _H_IMG_Rect
#define _H_IMG_Rect
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include "IMG_Types.h"
#include "IMG_Line.h"
diff --git a/source/blender/img/intern/IMG_Types.h b/source/blender/img/intern/IMG_Types.h
index ce08cda3401..d4988d39dc6 100644
--- a/source/blender/img/intern/IMG_Types.h
+++ b/source/blender/img/intern/IMG_Types.h
@@ -35,10 +35,6 @@
#ifndef _H_IMG_Types
#define _H_IMG_Types
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
typedef int TInt32;
typedef unsigned char TUns8;
typedef unsigned int TUns32;
diff --git a/source/blender/include/BDR_drawaction.h b/source/blender/include/BDR_drawaction.h
index 1712623ed2b..6764ced261e 100644
--- a/source/blender/include/BDR_drawaction.h
+++ b/source/blender/include/BDR_drawaction.h
@@ -33,10 +33,6 @@
#ifndef BDR_DRAWACTION_H
#define BDR_DRAWACTION_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
struct BezTriple;
struct Ipo;
struct gla2DDrawInfo;
diff --git a/source/blender/include/BDR_drawmesh.h b/source/blender/include/BDR_drawmesh.h
index 801700f3518..6bb1dea3396 100644
--- a/source/blender/include/BDR_drawmesh.h
+++ b/source/blender/include/BDR_drawmesh.h
@@ -33,10 +33,6 @@
#ifndef BDR_DRAWMESH_H
#define BDR_DRAWMESH_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
struct Image;
struct TFace;
struct Object;
diff --git a/source/blender/include/BDR_drawobject.h b/source/blender/include/BDR_drawobject.h
index 3b4bff76ad6..ddc694609fa 100644
--- a/source/blender/include/BDR_drawobject.h
+++ b/source/blender/include/BDR_drawobject.h
@@ -33,10 +33,6 @@
#ifndef BDR_DRAWOBJECT_H
#define BDR_DRAWOBJECT_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#ifdef __cplusplus
extern "C" {
#endif
diff --git a/source/blender/include/BDR_editcurve.h b/source/blender/include/BDR_editcurve.h
index 7a2e2f42973..2f12b40b079 100644
--- a/source/blender/include/BDR_editcurve.h
+++ b/source/blender/include/BDR_editcurve.h
@@ -33,10 +33,6 @@
#ifndef BDR_EDITCURVE_H
#define BDR_EDITCURVE_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
struct Curve;
struct Nurb;
struct BezTriple;
diff --git a/source/blender/include/BDR_editface.h b/source/blender/include/BDR_editface.h
index e6dbb2eeecb..41efb4fa4c5 100644
--- a/source/blender/include/BDR_editface.h
+++ b/source/blender/include/BDR_editface.h
@@ -33,10 +33,6 @@
#ifndef BDR_EDITFACE_H
#define BDR_EDITFACE_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
struct TFace;
struct Mesh;
diff --git a/source/blender/include/BDR_editmball.h b/source/blender/include/BDR_editmball.h
index 34fce39eae4..27dc5f651c9 100644
--- a/source/blender/include/BDR_editmball.h
+++ b/source/blender/include/BDR_editmball.h
@@ -33,10 +33,6 @@
#ifndef BDR_EDITMBALL_H
#define BDR_EDITMBALL_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
void make_editMball(void);
void load_editMball(void);
diff --git a/source/blender/include/BDR_editobject.h b/source/blender/include/BDR_editobject.h
index 04050fc6720..8eab5c3cb16 100644
--- a/source/blender/include/BDR_editobject.h
+++ b/source/blender/include/BDR_editobject.h
@@ -33,10 +33,6 @@
#ifndef BDR_EDITOBJECT_H
#define BDR_EDITOBJECT_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
struct TransVert;
struct Object;
struct TransOb;
diff --git a/source/blender/include/BDR_isect.h b/source/blender/include/BDR_isect.h
index 0e9c716d9f1..d44292da977 100644
--- a/source/blender/include/BDR_isect.h
+++ b/source/blender/include/BDR_isect.h
@@ -34,10 +34,6 @@
#ifndef BDR_ISECT_H
#define BDR_ISECT_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
struct EditVert;
struct EditVlak;
diff --git a/source/blender/include/BDR_vpaint.h b/source/blender/include/BDR_vpaint.h
index 6f1eb866ae2..36189b3e367 100644
--- a/source/blender/include/BDR_vpaint.h
+++ b/source/blender/include/BDR_vpaint.h
@@ -33,10 +33,6 @@
#ifndef BDR_VPAINT_H
#define BDR_VPAINT_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
struct Mesh;
struct MDeformVert; /* __NLA */
unsigned int vpaint_get_current_col(void);
diff --git a/source/blender/include/BIF_buttons.h b/source/blender/include/BIF_buttons.h
index d64077ab611..2f3a87baf5e 100644
--- a/source/blender/include/BIF_buttons.h
+++ b/source/blender/include/BIF_buttons.h
@@ -32,10 +32,6 @@
#ifndef BIF_BUTTONS_H
#define BIF_BUTTONS_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
struct Base;
extern void do_blenderbuttons(unsigned short event);
diff --git a/source/blender/include/BIF_drawimage.h b/source/blender/include/BIF_drawimage.h
index 4a439d14b9f..5eca69ca8be 100644
--- a/source/blender/include/BIF_drawimage.h
+++ b/source/blender/include/BIF_drawimage.h
@@ -33,10 +33,6 @@
#ifndef BIF_DRAWIMAGE_H
#define BIF_DRAWIMAGE_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
struct SpaceImage;
void calc_image_view(struct SpaceImage *sima, char mode);
diff --git a/source/blender/include/BIF_drawoops.h b/source/blender/include/BIF_drawoops.h
index 91f2da21718..d60d8b2e0de 100644
--- a/source/blender/include/BIF_drawoops.h
+++ b/source/blender/include/BIF_drawoops.h
@@ -33,10 +33,6 @@
#ifndef BIF_DRAWOOPS_H
#define BIF_DRAWOOPS_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
void give_oopslink_line(Oops *oops, OopsLink *ol, float *v1, float *v2);
void mysbox(float x1, float y1, float x2, float y2);
void boundbox_oops(void);
diff --git a/source/blender/include/BIF_drawscene.h b/source/blender/include/BIF_drawscene.h
index 4b70931c087..ad18542ebb4 100644
--- a/source/blender/include/BIF_drawscene.h
+++ b/source/blender/include/BIF_drawscene.h
@@ -30,10 +30,6 @@
* ***** END GPL/BL DUAL LICENSE BLOCK *****
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
struct Scene;
void set_scene(struct Scene *sce);
diff --git a/source/blender/include/BIF_drawseq.h b/source/blender/include/BIF_drawseq.h
index 7c68bf4c23c..d122aeb071e 100644
--- a/source/blender/include/BIF_drawseq.h
+++ b/source/blender/include/BIF_drawseq.h
@@ -33,10 +33,6 @@
#ifndef BIF_DRAWSEQ_H
#define BIF_DRAWSEQ_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
struct Sequence;
void drawseqspace(void);
void drawseq(struct Sequence *seq);
diff --git a/source/blender/include/BIF_drawtext.h b/source/blender/include/BIF_drawtext.h
index 06190b2ddc8..b0ec7a74ea3 100644
--- a/source/blender/include/BIF_drawtext.h
+++ b/source/blender/include/BIF_drawtext.h
@@ -33,10 +33,6 @@
#ifndef BIF_DRAWTEXT_H
#define BIF_DRAWTEXT_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
struct ScrArea;
struct SpaceText;
struct Text;
diff --git a/source/blender/include/BIF_editarmature.h b/source/blender/include/BIF_editarmature.h
index c18de7af00e..fac2eae6bf0 100644
--- a/source/blender/include/BIF_editarmature.h
+++ b/source/blender/include/BIF_editarmature.h
@@ -32,10 +32,6 @@
#ifndef BIF_EDITARMATURE_H
#define BIF_EDITARMATURE_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
struct Object;
struct Bone;
struct bArmature;
diff --git a/source/blender/include/BIF_editconstraint.h b/source/blender/include/BIF_editconstraint.h
index 2bad244c253..5d6d38fd529 100644
--- a/source/blender/include/BIF_editconstraint.h
+++ b/source/blender/include/BIF_editconstraint.h
@@ -33,10 +33,6 @@
#ifndef BIF_EDITCONSTRAINT_H
#define BIF_EDITCONSTRAINT_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
struct ListBase;
struct Object;
struct bConstraint;
diff --git a/source/blender/include/BIF_editdeform.h b/source/blender/include/BIF_editdeform.h
index 0d67eb76041..5fcd0473ce5 100644
--- a/source/blender/include/BIF_editdeform.h
+++ b/source/blender/include/BIF_editdeform.h
@@ -33,10 +33,6 @@
#ifndef BIF_DEFORM_H
#define BIF_DEFORM_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
struct Object;
struct MDeformVert;
struct MDeformWeight;
diff --git a/source/blender/include/BIF_editfont.h b/source/blender/include/BIF_editfont.h
index 17b4fa17103..d45ca41cd8c 100644
--- a/source/blender/include/BIF_editfont.h
+++ b/source/blender/include/BIF_editfont.h
@@ -33,10 +33,6 @@
#ifndef BIF_EDITFONT_H
#define BIF_EDITFONT_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
void do_textedit(unsigned short event, short val, char ascii);
void make_editText(void);
void load_editText(void);
diff --git a/source/blender/include/BIF_editgroup.h b/source/blender/include/BIF_editgroup.h
index bb947072a39..e6b591f90ee 100644
--- a/source/blender/include/BIF_editgroup.h
+++ b/source/blender/include/BIF_editgroup.h
@@ -30,10 +30,6 @@
* ***** END GPL/BL DUAL LICENSE BLOCK *****
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
struct Group;
void set_active_group(void);
void add_selected_to_group(void);
diff --git a/source/blender/include/BIF_editika.h b/source/blender/include/BIF_editika.h
index e587b7ff255..9160d7e4baf 100644
--- a/source/blender/include/BIF_editika.h
+++ b/source/blender/include/BIF_editika.h
@@ -30,10 +30,6 @@
* ***** END GPL/BL DUAL LICENSE BLOCK *****
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
struct Object;
void draw_ika(struct Object *ob, int sel);
void draw_ika_nrs(struct Object *ob, int type);
diff --git a/source/blender/include/BIF_editkey.h b/source/blender/include/BIF_editkey.h
index 777931053ab..0a9b14dee16 100644
--- a/source/blender/include/BIF_editkey.h
+++ b/source/blender/include/BIF_editkey.h
@@ -33,10 +33,6 @@
#ifndef BIF_EDITKEY_H
#define BIF_EDITKEY_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
struct Key;
struct KeyBlock;
struct Mesh;
diff --git a/source/blender/include/BIF_editlattice.h b/source/blender/include/BIF_editlattice.h
index d0a66136d6b..738eb14847c 100644
--- a/source/blender/include/BIF_editlattice.h
+++ b/source/blender/include/BIF_editlattice.h
@@ -33,10 +33,6 @@
#ifndef BIF_EDITLATTICE_H
#define BIF_EDITLATTICE_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
void apply_lattice(void);
void free_editLatt(void);
void make_editLatt(void);
diff --git a/source/blender/include/BIF_editmesh.h b/source/blender/include/BIF_editmesh.h
index 453940a7967..8a72a63f323 100644
--- a/source/blender/include/BIF_editmesh.h
+++ b/source/blender/include/BIF_editmesh.h
@@ -33,10 +33,6 @@
#ifndef BIF_EDITMESH_H
#define BIF_EDITMESH_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
struct EditVlak;
struct EditEdge;
struct EditVert;
diff --git a/source/blender/include/BIF_editnla.h b/source/blender/include/BIF_editnla.h
index 58af34123f1..c70969ed575 100644
--- a/source/blender/include/BIF_editnla.h
+++ b/source/blender/include/BIF_editnla.h
@@ -33,10 +33,6 @@
#ifndef BIF_EDITNLA_H
#define BIF_EDITNLA_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
void clever_numbuts_nla(void);
#endif
diff --git a/source/blender/include/BIF_editoops.h b/source/blender/include/BIF_editoops.h
index bd5f9f5e099..7c5905e1fa8 100644
--- a/source/blender/include/BIF_editoops.h
+++ b/source/blender/include/BIF_editoops.h
@@ -33,10 +33,6 @@
#ifndef BIF_EDITOOPS_H
#define BIF_EDITOOPS_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
void borderselect_oops(void);
void deselect_all_area_oops(void);
void mouse_select_oops(void);
diff --git a/source/blender/include/BIF_editsca.h b/source/blender/include/BIF_editsca.h
index 6af0d73ce81..c8e8a33d475 100644
--- a/source/blender/include/BIF_editsca.h
+++ b/source/blender/include/BIF_editsca.h
@@ -33,10 +33,6 @@
#ifndef BIF_EDITSCA_H
#define BIF_EDITSCA_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
void make_unique_prop_names(char *str);
void do_gamebuts(unsigned short event);
void gamebuts(void);
diff --git a/source/blender/include/BIF_editseq.h b/source/blender/include/BIF_editseq.h
index 21a86185520..52233daea91 100644
--- a/source/blender/include/BIF_editseq.h
+++ b/source/blender/include/BIF_editseq.h
@@ -33,10 +33,6 @@
#ifndef BIF_EDITSEQ_H
#define BIF_EDITSEQ_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
struct Sequence;
void add_duplicate_seq(void);
diff --git a/source/blender/include/BIF_editsima.h b/source/blender/include/BIF_editsima.h
index 60e85b6552e..a3b4ed546c1 100644
--- a/source/blender/include/BIF_editsima.h
+++ b/source/blender/include/BIF_editsima.h
@@ -30,10 +30,6 @@
* ***** END GPL/BL DUAL LICENSE BLOCK *****
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
void clever_numbuts_sima(void);
void borderselect_sima(void);
void mouseco_to_curtile(void);
diff --git a/source/blender/include/BIF_editsound.h b/source/blender/include/BIF_editsound.h
index e25e60042a5..e4b730aedc8 100644
--- a/source/blender/include/BIF_editsound.h
+++ b/source/blender/include/BIF_editsound.h
@@ -33,10 +33,6 @@
#ifndef BIF_EDITSOUND_H
#define BIF_EDITSOUND_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
struct bSound;
struct bSample;
struct ListBase;
diff --git a/source/blender/include/BIF_editview.h b/source/blender/include/BIF_editview.h
index 3076d10cac8..dc47fb61b51 100644
--- a/source/blender/include/BIF_editview.h
+++ b/source/blender/include/BIF_editview.h
@@ -33,10 +33,6 @@
#ifndef BIF_EDITVIEW_H
#define BIF_EDITVIEW_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
struct Base;
struct Object;
diff --git a/source/blender/include/BIF_fsmenu.h b/source/blender/include/BIF_fsmenu.h
index 06c884898d4..50b671c6f3d 100644
--- a/source/blender/include/BIF_fsmenu.h
+++ b/source/blender/include/BIF_fsmenu.h
@@ -34,10 +34,6 @@
#ifndef BSE_FSMENU_H
#define BSE_FSMENU_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
/** Returns the number of entries in the Fileselect Menu */
int fsmenu_get_nentries (void);
diff --git a/source/blender/include/BIF_gl.h b/source/blender/include/BIF_gl.h
index 164fb15b410..291c465c6c6 100644
--- a/source/blender/include/BIF_gl.h
+++ b/source/blender/include/BIF_gl.h
@@ -37,10 +37,6 @@
#include <GL/gl.h>
#include <GL/glu.h>
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
/*
* these should be phased out. cpack should be replaced in
* code with calls to glColor3ub, lrectwrite probably should
diff --git a/source/blender/include/BIF_glutil.h b/source/blender/include/BIF_glutil.h
index 19bd69568e6..93617cf6bfb 100644
--- a/source/blender/include/BIF_glutil.h
+++ b/source/blender/include/BIF_glutil.h
@@ -37,10 +37,6 @@
#ifndef BIF_GLUTIL_H
#define BIF_GLUTIL_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
struct rcti;
struct rctf;
diff --git a/source/blender/include/BIF_graphics.h b/source/blender/include/BIF_graphics.h
index 811135c74d2..90e77e1fb7e 100644
--- a/source/blender/include/BIF_graphics.h
+++ b/source/blender/include/BIF_graphics.h
@@ -33,10 +33,6 @@
#ifndef BIF_GRAPHICS_H
#define BIF_GRAPHICS_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
/* XXX, should move somewhere else, with collected windowing
* stuff, to be done once the proper windowing stuff has
* been formed.
diff --git a/source/blender/include/BIF_imasel.h b/source/blender/include/BIF_imasel.h
index 1033fd41be2..01958f66964 100644
--- a/source/blender/include/BIF_imasel.h
+++ b/source/blender/include/BIF_imasel.h
@@ -32,10 +32,6 @@
#ifndef BIF_IMASEL_H
#define BIF_IMASEL_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
struct SpaceImaSel;
struct OneSelectableIma;
struct ScrArea;
diff --git a/source/blender/include/BIF_interface.h b/source/blender/include/BIF_interface.h
index 72674193443..4246583e58c 100644
--- a/source/blender/include/BIF_interface.h
+++ b/source/blender/include/BIF_interface.h
@@ -33,10 +33,6 @@
#ifndef BIF_INTERFACE_H
#define BIF_INTERFACE_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
struct ID;
struct ListBase;
struct ScrArea;
diff --git a/source/blender/include/BIF_keyval.h b/source/blender/include/BIF_keyval.h
index 55d49e33b5b..7134bd2b153 100644
--- a/source/blender/include/BIF_keyval.h
+++ b/source/blender/include/BIF_keyval.h
@@ -33,10 +33,6 @@
#ifndef BIF_KEYVAL_H
#define BIF_KEYVAL_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
char *key_event_to_string(unsigned short event);
#endif
diff --git a/source/blender/include/BIF_mainqueue.h b/source/blender/include/BIF_mainqueue.h
index 4800aead5a7..48df45bf3bf 100644
--- a/source/blender/include/BIF_mainqueue.h
+++ b/source/blender/include/BIF_mainqueue.h
@@ -35,10 +35,6 @@
#ifndef BIF_MAINQUEUE_H
#define BIF_MAINQUEUE_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#define MAXQUEUE 256
unsigned short mainqtest (void);
diff --git a/source/blender/include/BIF_mywindow.h b/source/blender/include/BIF_mywindow.h
index 6db64cea4e3..1e581b3dc4b 100644
--- a/source/blender/include/BIF_mywindow.h
+++ b/source/blender/include/BIF_mywindow.h
@@ -36,10 +36,6 @@
#ifndef BIF_MYWINDOW_H
#define BIF_MYWINDOW_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
struct rcti;
/*---*/
diff --git a/source/blender/include/BIF_oops.h b/source/blender/include/BIF_oops.h
index 4682f6ad61d..bf08e9f1380 100644
--- a/source/blender/include/BIF_oops.h
+++ b/source/blender/include/BIF_oops.h
@@ -33,10 +33,6 @@
#ifndef BIF_OOPS_H
#define BIF_OOPS_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
struct Curve;
struct Oops;
struct OopsLink;
diff --git a/source/blender/include/BIF_poseobject.h b/source/blender/include/BIF_poseobject.h
index e0afe0afaa3..872584edfe9 100644
--- a/source/blender/include/BIF_poseobject.h
+++ b/source/blender/include/BIF_poseobject.h
@@ -33,10 +33,6 @@
#ifndef BIF_POSEOBJECT
#define BIF_POSEOBJECT
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
/**
* Activates posemode
*/
diff --git a/source/blender/include/BIF_previewrender.h b/source/blender/include/BIF_previewrender.h
index 8f4c40168b1..c7f492c3211 100644
--- a/source/blender/include/BIF_previewrender.h
+++ b/source/blender/include/BIF_previewrender.h
@@ -30,10 +30,6 @@
* ***** END GPL/BL DUAL LICENSE BLOCK *****
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
struct SpaceButs;
void BIF_preview_changed (struct SpaceButs *area);
diff --git a/source/blender/include/BIF_renderwin.h b/source/blender/include/BIF_renderwin.h
index 148dec25486..efc13950bd6 100644
--- a/source/blender/include/BIF_renderwin.h
+++ b/source/blender/include/BIF_renderwin.h
@@ -30,10 +30,6 @@
* ***** END GPL/BL DUAL LICENSE BLOCK *****
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
struct ScrArea;
void calc_renderwin_rectangle(int posmask, int renderpos_r[2], int rendersize_r[2]);
diff --git a/source/blender/include/BIF_resources.h b/source/blender/include/BIF_resources.h
index 80564d47ae5..2a53842adba 100644
--- a/source/blender/include/BIF_resources.h
+++ b/source/blender/include/BIF_resources.h
@@ -33,10 +33,6 @@
#ifndef BIF_RESOURCES_H
#define BIF_RESOURCES_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
typedef enum {
#define BIFICONID_FIRST (ICON_VIEW3D)
ICON_VIEW3D,
diff --git a/source/blender/include/BIF_scrarea.h b/source/blender/include/BIF_scrarea.h
index a8b40b2eda0..c2953078edc 100644
--- a/source/blender/include/BIF_scrarea.h
+++ b/source/blender/include/BIF_scrarea.h
@@ -30,10 +30,6 @@
* ***** END GPL/BL DUAL LICENSE BLOCK *****
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#ifdef __cplusplus
extern "C" {
#endif
diff --git a/source/blender/include/BIF_screen.h b/source/blender/include/BIF_screen.h
index fd77ca5f652..e92c2933162 100644
--- a/source/blender/include/BIF_screen.h
+++ b/source/blender/include/BIF_screen.h
@@ -34,10 +34,6 @@
* ***** END GPL/BL DUAL LICENSE BLOCK *****
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#ifndef BIF_SCREEN_H
#define BIF_SCREEN_H
diff --git a/source/blender/include/BIF_space.h b/source/blender/include/BIF_space.h
index edab40ac386..7d3deec1be9 100644
--- a/source/blender/include/BIF_space.h
+++ b/source/blender/include/BIF_space.h
@@ -30,10 +30,6 @@
* ***** END GPL/BL DUAL LICENSE BLOCK *****
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#ifndef BIF_SPACE_H
#define BIF_SPACE_H
diff --git a/source/blender/include/BIF_spacetypes.h b/source/blender/include/BIF_spacetypes.h
index 78cd03ad7a6..9ce075fd917 100644
--- a/source/blender/include/BIF_spacetypes.h
+++ b/source/blender/include/BIF_spacetypes.h
@@ -30,10 +30,6 @@
* ***** END GPL/BL DUAL LICENSE BLOCK *****
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
struct ScrArea;
typedef struct _SpaceType SpaceType;
diff --git a/source/blender/include/BIF_toets.h b/source/blender/include/BIF_toets.h
index 9a931df5cd7..ef16186f15f 100644
--- a/source/blender/include/BIF_toets.h
+++ b/source/blender/include/BIF_toets.h
@@ -33,10 +33,6 @@
#ifndef BIF_TOETS_H
#define BIF_TOETS_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
void BIF_save_rendered_image(void);
int save_image_filesel_str(char *str);
diff --git a/source/blender/include/BIF_toolbox.h b/source/blender/include/BIF_toolbox.h
index 9ed28c6a288..8d63feba1ee 100644
--- a/source/blender/include/BIF_toolbox.h
+++ b/source/blender/include/BIF_toolbox.h
@@ -30,10 +30,6 @@
* ***** END GPL/BL DUAL LICENSE BLOCK *****
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
/* TBOXX: breedte in pixels */
#define TBOXXL 80
#define TBOXXR 170
diff --git a/source/blender/include/BIF_usiblender.h b/source/blender/include/BIF_usiblender.h
index eb47a50015c..d32c444e5e6 100644
--- a/source/blender/include/BIF_usiblender.h
+++ b/source/blender/include/BIF_usiblender.h
@@ -33,10 +33,6 @@
#ifndef BIF_USIBLENDER_H
#define BIF_USIBLENDER_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
void exit_usiblender(void);
void BIF_init(void);
diff --git a/source/blender/include/BIF_writeavicodec.h b/source/blender/include/BIF_writeavicodec.h
index 1bfe8414a4c..e096cbd27f3 100644
--- a/source/blender/include/BIF_writeavicodec.h
+++ b/source/blender/include/BIF_writeavicodec.h
@@ -33,10 +33,6 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#ifdef _WIN32
void start_avi_codec(void);
diff --git a/source/blender/include/BIF_writeimage.h b/source/blender/include/BIF_writeimage.h
index 29590f9bf0f..318a4294371 100644
--- a/source/blender/include/BIF_writeimage.h
+++ b/source/blender/include/BIF_writeimage.h
@@ -33,10 +33,6 @@
#ifndef BIF_WRITEIMAGE_H
#define BIF_WRITEIMAGE_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
struct ImBuf;
struct EnvMap;
diff --git a/source/blender/include/BIF_writemovie.h b/source/blender/include/BIF_writemovie.h
index c52103a6c85..8dab1d4e7f8 100644
--- a/source/blender/include/BIF_writemovie.h
+++ b/source/blender/include/BIF_writemovie.h
@@ -33,10 +33,6 @@
#ifndef BIF_WRITEMOVIE_H
#define BIF_WRITEMOVIE_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
void start_movie(void);
void append_movie(int fnum);
void end_movie(void);
diff --git a/source/blender/include/BSE_buttons.h b/source/blender/include/BSE_buttons.h
index 117b2d51baf..dd2332fbec2 100644
--- a/source/blender/include/BSE_buttons.h
+++ b/source/blender/include/BSE_buttons.h
@@ -33,10 +33,6 @@
#ifndef BSE_BUTTONS_H
#define BSE_BUTTONS_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
struct ID;
void test_meshpoin_but(char *name, struct ID **idpp);
diff --git a/source/blender/include/BSE_drawimasel.h b/source/blender/include/BSE_drawimasel.h
index 4b8f6c627fa..3064c53b4d0 100644
--- a/source/blender/include/BSE_drawimasel.h
+++ b/source/blender/include/BSE_drawimasel.h
@@ -33,10 +33,6 @@
#ifndef BSE_DRAWIMASEL_H
#define BSE_DRAWIMASEL_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
struct SpaceImaSel;
void viewgate(short sx, short sy, short ex, short ey);
diff --git a/source/blender/include/BSE_drawipo.h b/source/blender/include/BSE_drawipo.h
index 074ed757bbf..6bb6f717b71 100644
--- a/source/blender/include/BSE_drawipo.h
+++ b/source/blender/include/BSE_drawipo.h
@@ -33,10 +33,6 @@
#ifndef BSE_DRAWIPO_H
#define BSE_DRAWIPO_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
struct EditIpo;
struct View2D;
struct rctf;
diff --git a/source/blender/include/BSE_drawnla.h b/source/blender/include/BSE_drawnla.h
index 0809491d173..b71c604acfe 100644
--- a/source/blender/include/BSE_drawnla.h
+++ b/source/blender/include/BSE_drawnla.h
@@ -33,10 +33,6 @@
#ifndef BSE_DRAWNLA_H
#define BSE_DRAWNLA_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
void drawnlaspace(void);
#endif /* BSE_DRAWNLA */
diff --git a/source/blender/include/BSE_drawoops.h b/source/blender/include/BSE_drawoops.h
index 116fe8d9d28..ef52d9e2c92 100644
--- a/source/blender/include/BSE_drawoops.h
+++ b/source/blender/include/BSE_drawoops.h
@@ -33,10 +33,6 @@
#ifndef BSE_DRAWOOPS_H
#define BSE_DRAWOOPS_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
struct Oops;
struct uiBlock;
diff --git a/source/blender/include/BSE_drawview.h b/source/blender/include/BSE_drawview.h
index aa206c2dba6..69299255b1c 100644
--- a/source/blender/include/BSE_drawview.h
+++ b/source/blender/include/BSE_drawview.h
@@ -33,10 +33,6 @@
#ifndef BSE_DRAWVIEW_H
#define BSE_DRAWVIEW_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
struct Object;
struct BGpic;
struct rcti;
diff --git a/source/blender/include/BSE_edit.h b/source/blender/include/BSE_edit.h
index 0fc3176e5d2..cb76517fe56 100644
--- a/source/blender/include/BSE_edit.h
+++ b/source/blender/include/BSE_edit.h
@@ -33,10 +33,6 @@
#ifndef BSE_EDIT_H
#define BSE_EDIT_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
struct Object;
struct rcti;
diff --git a/source/blender/include/BSE_editaction.h b/source/blender/include/BSE_editaction.h
index 8beb5479a8f..841549de260 100644
--- a/source/blender/include/BSE_editaction.h
+++ b/source/blender/include/BSE_editaction.h
@@ -33,10 +33,6 @@
#ifndef BSE_EDITACTION_H
#define BSE_EDITACTION_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
struct bAction;
struct bActionChannel;
struct bPoseChannel;
diff --git a/source/blender/include/BSE_editaction_types.h b/source/blender/include/BSE_editaction_types.h
index e28e82ce2c6..16e4890daef 100644
--- a/source/blender/include/BSE_editaction_types.h
+++ b/source/blender/include/BSE_editaction_types.h
@@ -33,10 +33,6 @@
#ifndef BSE_EDITACTION_TYPES_H
#define BSE_EDITACTION_TYPES_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#define CHANNELHEIGHT 16
#define CHANNELSKIP 2
#define ACTWIDTH 128
diff --git a/source/blender/include/BSE_editipo.h b/source/blender/include/BSE_editipo.h
index 334c1e452ba..69fb9dd65ac 100644
--- a/source/blender/include/BSE_editipo.h
+++ b/source/blender/include/BSE_editipo.h
@@ -33,10 +33,6 @@
#ifndef BSE_EDITIPO_H
#define BSE_EDITIPO_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
struct TransVert;
struct IpoCurve;
struct BezTriple;
diff --git a/source/blender/include/BSE_editipo_types.h b/source/blender/include/BSE_editipo_types.h
index 1129df2117b..b21cdcee7aa 100644
--- a/source/blender/include/BSE_editipo_types.h
+++ b/source/blender/include/BSE_editipo_types.h
@@ -33,10 +33,6 @@
#ifndef BSE_EDITIPO_TYPES_H
#define BSE_EDITIPO_TYPES_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
struct BezTriple;
typedef struct IpoKey {
diff --git a/source/blender/include/BSE_editnla_types.h b/source/blender/include/BSE_editnla_types.h
index 6745fc6aa92..4316b857568 100644
--- a/source/blender/include/BSE_editnla_types.h
+++ b/source/blender/include/BSE_editnla_types.h
@@ -33,10 +33,6 @@
#ifndef BSE_EDITNLA_TYPES_H
#define BSE_EDITNLA_TYPES_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#define NLAWIDTH 196
#define NLACHANNELHEIGHT 16
#define NLACHANNELSKIP 1
diff --git a/source/blender/include/BSE_filesel.h b/source/blender/include/BSE_filesel.h
index 00a781ce23b..87daea87bf2 100644
--- a/source/blender/include/BSE_filesel.h
+++ b/source/blender/include/BSE_filesel.h
@@ -34,10 +34,6 @@
#ifndef BSE_FILESEL_H
#define BSE_FILESEL_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
struct SpaceFile;
struct direntry;
struct ID;
diff --git a/source/blender/include/BSE_headerbuttons.h b/source/blender/include/BSE_headerbuttons.h
index 16f344fedc5..3399911e189 100644
--- a/source/blender/include/BSE_headerbuttons.h
+++ b/source/blender/include/BSE_headerbuttons.h
@@ -33,10 +33,6 @@
#ifndef BSE_HEADERBUTTONS_H
#define BSE_HEADERBUTTONS_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
struct uiBlock;
struct ID;
diff --git a/source/blender/include/BSE_sequence.h b/source/blender/include/BSE_sequence.h
index 796dae48f27..43a8a627824 100644
--- a/source/blender/include/BSE_sequence.h
+++ b/source/blender/include/BSE_sequence.h
@@ -34,10 +34,6 @@
#ifndef BSE_SEQUENCE_H
#define BSE_SEQUENCE_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
struct PluginSeq;
struct StripElem;
struct Strip;
diff --git a/source/blender/include/BSE_trans_types.h b/source/blender/include/BSE_trans_types.h
index 746bc03a00b..63f3968da42 100644
--- a/source/blender/include/BSE_trans_types.h
+++ b/source/blender/include/BSE_trans_types.h
@@ -33,10 +33,6 @@
#ifndef BSE_TRANS_TYPES_H
#define BSE_TRANS_TYPES_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
struct Object;
/* struct EditVlak; */
/* struct EditEdge; */
diff --git a/source/blender/include/BSE_types.h b/source/blender/include/BSE_types.h
index 37f0b8e6cc5..cc241465dfa 100644
--- a/source/blender/include/BSE_types.h
+++ b/source/blender/include/BSE_types.h
@@ -32,10 +32,6 @@
/* forward declarations for some prototype header */
/* these may wildly occur in other header files, too */
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
struct BGpic;
struct SpaceText;
struct Oops;
diff --git a/source/blender/include/BSE_view.h b/source/blender/include/BSE_view.h
index 2ef720dcd51..e6477012c8a 100644
--- a/source/blender/include/BSE_view.h
+++ b/source/blender/include/BSE_view.h
@@ -34,10 +34,6 @@
#ifndef BSE_VIEW_H
#define BSE_VIEW_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
struct Object;
struct BoundBox;
struct View3D;
diff --git a/source/blender/include/LOD_DependKludge.h b/source/blender/include/LOD_DependKludge.h
index 16d0ee8c463..43034201b81 100644
--- a/source/blender/include/LOD_DependKludge.h
+++ b/source/blender/include/LOD_DependKludge.h
@@ -34,10 +34,6 @@
#ifndef LOD_DEPENDKLUDGE_H
#define LOD_DEPENDKLUDGE_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#define NAN_DECIMATION
#endif //LOD_DEPENDKLUDGE_H
diff --git a/source/blender/include/TPT_DependKludge.h b/source/blender/include/TPT_DependKludge.h
index ed7a4e19da7..621d7a7241a 100644
--- a/source/blender/include/TPT_DependKludge.h
+++ b/source/blender/include/TPT_DependKludge.h
@@ -34,10 +34,6 @@
#ifndef TPT_DEPENDKLUDGE_H
#define TPT_DEPENDKLUDGE_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#define NAN_TPT
//#undef NAN_TPT
diff --git a/source/blender/include/blendef.h b/source/blender/include/blendef.h
index c1e34a528fd..1dbc0a78701 100644
--- a/source/blender/include/blendef.h
+++ b/source/blender/include/blendef.h
@@ -31,10 +31,6 @@
#ifndef BLENDEF_H
#define BLENDEF_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#ifdef WIN32
#else
#ifndef __BeOS
diff --git a/source/blender/include/datatoc.h b/source/blender/include/datatoc.h
index 79a7b5f39f7..51a1cf6204a 100644
--- a/source/blender/include/datatoc.h
+++ b/source/blender/include/datatoc.h
@@ -35,10 +35,6 @@
#ifndef DATATOC_H
#define DATATOC_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
extern int datatoc_B_blend_size;
extern char datatoc_B_blend[];
diff --git a/source/blender/include/editlattice_ext.h b/source/blender/include/editlattice_ext.h
index 6fa0c8a989b..afb109df5f7 100644
--- a/source/blender/include/editlattice_ext.h
+++ b/source/blender/include/editlattice_ext.h
@@ -36,10 +36,6 @@
#define EDITLATTICE_EXT_H "$Id$"
#define EDITLATTICE_EXT_H "Copyright (C) 2001 NaN Technologies B.V.
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
void end_latt_deform(void);
#endif /* EDITLATTICE_EXT_H */
diff --git a/source/blender/include/interface.h b/source/blender/include/interface.h
index fe20a365cf2..3f37b5fe52e 100644
--- a/source/blender/include/interface.h
+++ b/source/blender/include/interface.h
@@ -33,10 +33,6 @@
#ifndef INTERFACE_H
#define INTERFACE_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
/* general defines */
#define UI_MAX_DRAW_STR 180
diff --git a/source/blender/include/ipo.h b/source/blender/include/ipo.h
index 35c5b0d95f6..4336076dfd1 100644
--- a/source/blender/include/ipo.h
+++ b/source/blender/include/ipo.h
@@ -37,10 +37,6 @@
#ifndef IPO_H
#define IPO_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
struct BezTriple;
typedef struct IpoKey {
diff --git a/source/blender/include/keyed_functions.h b/source/blender/include/keyed_functions.h
index d1b09c40909..eaa5ee99211 100644
--- a/source/blender/include/keyed_functions.h
+++ b/source/blender/include/keyed_functions.h
@@ -29,10 +29,6 @@
* ***** END GPL/BL DUAL LICENSE BLOCK *****
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#define KEY_GETPTR(x) (g_ptrtab ? g_ptrtab[x] : 0)
/* these are the defines for the keyed functions:
diff --git a/source/blender/include/license_key.h b/source/blender/include/license_key.h
index fe5c4e89392..1346998f520 100644
--- a/source/blender/include/license_key.h
+++ b/source/blender/include/license_key.h
@@ -32,10 +32,6 @@
#ifndef LICENCEKEY_H
#define LICENCEKEY_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#define I_AM_PUBLISHER temp_val2
#define LICENSE_KEY_VALID temp_val
#define SHOW_LICENSE_KEY rotop
diff --git a/source/blender/include/mydevice.h b/source/blender/include/mydevice.h
index ecc13672d06..43e42c8a49a 100644
--- a/source/blender/include/mydevice.h
+++ b/source/blender/include/mydevice.h
@@ -38,10 +38,6 @@
* ***** END GPL/BL DUAL LICENSE BLOCK *****
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
/* MOUSE : 0x00x */
#define LEFTMOUSE 0x001
diff --git a/source/blender/include/nla.h b/source/blender/include/nla.h
index 6bd6518c4ab..d5685f9550e 100644
--- a/source/blender/include/nla.h
+++ b/source/blender/include/nla.h
@@ -53,10 +53,6 @@
#ifndef NLA_H
#define NLA_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#define __NLA
#define __NLA_BAKE // Not for release: Not yet fully implemented
diff --git a/source/blender/include/objfnt.h b/source/blender/include/objfnt.h
index 906b8a5a1cc..e54b7b5e1e3 100644
--- a/source/blender/include/objfnt.h
+++ b/source/blender/include/objfnt.h
@@ -31,10 +31,6 @@
#ifndef OBJFNTDEF
#define OBJFNTDEF
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
typedef struct chardesc {
short movex, movey; /* advance */
short llx, lly; /* bounding box */
diff --git a/source/blender/include/particle_effect.h b/source/blender/include/particle_effect.h
index 776714e8263..86a0417b807 100644
--- a/source/blender/include/particle_effect.h
+++ b/source/blender/include/particle_effect.h
@@ -34,10 +34,6 @@
#ifndef PARTICLE_EFFECT_H
#define PARTICLE_EFFECT_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
/* effect.c */
extern Effect *add_effect(int type);
extern PartEff *give_parteff(Object *ob);
diff --git a/source/blender/include/playanim_ext.h b/source/blender/include/playanim_ext.h
index 6da88e434c7..bef610ac018 100644
--- a/source/blender/include/playanim_ext.h
+++ b/source/blender/include/playanim_ext.h
@@ -34,10 +34,6 @@
#ifndef PLAYANIM_EXT_H
#define PLAYANIM_EXT_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
/* used in apps */
extern void playanim(int argc, char **argv);
diff --git a/source/blender/inflate/BLO_in_de_flateHeader.h b/source/blender/inflate/BLO_in_de_flateHeader.h
index ddc725df02a..6504dd66a80 100644
--- a/source/blender/inflate/BLO_in_de_flateHeader.h
+++ b/source/blender/inflate/BLO_in_de_flateHeader.h
@@ -34,10 +34,6 @@
#ifndef BLO_IN_DE_FLATE_H
#define BLO_IN_DE_FLATE_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#ifdef __cplusplus
extern "C" {
#endif
diff --git a/source/blender/inflate/BLO_inflate.h b/source/blender/inflate/BLO_inflate.h
index 5cecac1d2fd..7e8895e95dc 100644
--- a/source/blender/inflate/BLO_inflate.h
+++ b/source/blender/inflate/BLO_inflate.h
@@ -34,10 +34,6 @@
#ifndef BLO_INFLATE_H
#define BLO_INFLATE_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#ifdef __cplusplus
extern "C" {
#endif
diff --git a/source/blender/makesdna/DNA_ID.h b/source/blender/makesdna/DNA_ID.h
index c6628785022..f99de9106a8 100644
--- a/source/blender/makesdna/DNA_ID.h
+++ b/source/blender/makesdna/DNA_ID.h
@@ -36,10 +36,6 @@
#ifndef DNA_ID_H
#define DNA_ID_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#ifdef __cplusplus
extern "C" {
#endif
diff --git a/source/blender/makesdna/DNA_action_types.h b/source/blender/makesdna/DNA_action_types.h
index b8d8c6436a3..6be0096f0fb 100644
--- a/source/blender/makesdna/DNA_action_types.h
+++ b/source/blender/makesdna/DNA_action_types.h
@@ -39,10 +39,6 @@
#ifndef DNA_ACTION_TYPES_H
#define DNA_ACTION_TYPES_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include "DNA_listBase.h"
#include "DNA_ID.h"
#include "DNA_view2d_types.h"
diff --git a/source/blender/makesdna/DNA_actuator_types.h b/source/blender/makesdna/DNA_actuator_types.h
index d2c37ba59e3..40a6c4a80a0 100644
--- a/source/blender/makesdna/DNA_actuator_types.h
+++ b/source/blender/makesdna/DNA_actuator_types.h
@@ -34,10 +34,6 @@
#ifndef DNA_ACTUATOR_TYPES_H
#define DNA_ACTUATOR_TYPES_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
struct Object;
struct Mesh;
struct Scene;
diff --git a/source/blender/makesdna/DNA_armature_types.h b/source/blender/makesdna/DNA_armature_types.h
index 293c9d4e641..af80a69046f 100644
--- a/source/blender/makesdna/DNA_armature_types.h
+++ b/source/blender/makesdna/DNA_armature_types.h
@@ -33,10 +33,6 @@
#ifndef DNA_ARMATURE_TYPES_H
#define DNA_ARMATURE_TYPES_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include "DNA_listBase.h"
#include "DNA_ID.h"
diff --git a/source/blender/makesdna/DNA_camera_types.h b/source/blender/makesdna/DNA_camera_types.h
index 7dbcc1ea67c..61286c846b9 100644
--- a/source/blender/makesdna/DNA_camera_types.h
+++ b/source/blender/makesdna/DNA_camera_types.h
@@ -37,10 +37,6 @@
#include "DNA_ID.h"
#include "DNA_scriptlink_types.h"
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#ifdef __cplusplus
extern "C" {
#endif
diff --git a/source/blender/makesdna/DNA_constraint_types.h b/source/blender/makesdna/DNA_constraint_types.h
index 09a2e97e2f9..02199b9aa01 100644
--- a/source/blender/makesdna/DNA_constraint_types.h
+++ b/source/blender/makesdna/DNA_constraint_types.h
@@ -34,10 +34,6 @@
#ifndef DNA_CONSTRAINT_TYPES_H
#define DNA_CONSTRAINT_TYPES_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include "DNA_ID.h"
#include "DNA_ipo_types.h"
#include "DNA_object_types.h"
diff --git a/source/blender/makesdna/DNA_controller_types.h b/source/blender/makesdna/DNA_controller_types.h
index bb2543ac458..b8bffd68db8 100644
--- a/source/blender/makesdna/DNA_controller_types.h
+++ b/source/blender/makesdna/DNA_controller_types.h
@@ -34,10 +34,6 @@
#ifndef DNA_CONTROLLER_TYPES_H
#define DNA_CONTROLLER_TYPES_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
struct bActuator;
struct Text;
struct bSensor;
diff --git a/source/blender/makesdna/DNA_curve_types.h b/source/blender/makesdna/DNA_curve_types.h
index 2ffb7327dc0..55d38171a10 100644
--- a/source/blender/makesdna/DNA_curve_types.h
+++ b/source/blender/makesdna/DNA_curve_types.h
@@ -36,10 +36,6 @@
#ifndef DNA_CURVE_TYPES_H
#define DNA_CURVE_TYPES_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include "DNA_listBase.h"
#include "DNA_vec_types.h"
#include "DNA_ID.h"
diff --git a/source/blender/makesdna/DNA_effect_types.h b/source/blender/makesdna/DNA_effect_types.h
index b5aaba5c5fc..4d843772ce9 100644
--- a/source/blender/makesdna/DNA_effect_types.h
+++ b/source/blender/makesdna/DNA_effect_types.h
@@ -34,10 +34,6 @@
#ifndef DNA_EFFECT_TYPES_H
#define DNA_EFFECT_TYPES_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
/* DENK ERAAN: NIEUWE EFFECTEN OOK IN DE WRITEFILE.C IVM DNA!!! */
#define PAF_MAXMULT 4
diff --git a/source/blender/makesdna/DNA_fileglobal_types.h b/source/blender/makesdna/DNA_fileglobal_types.h
index 7a50cfce422..1d1d5b2b7f7 100644
--- a/source/blender/makesdna/DNA_fileglobal_types.h
+++ b/source/blender/makesdna/DNA_fileglobal_types.h
@@ -34,10 +34,6 @@
#ifndef DNA_FILEGLOBAL_TYPES_H
#define DNA_FILEGLOBAL_TYPES_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
/**
* FileGlobal stores a part of the current user-unterface settings at
* the moment of saving, and the file-specific settings.
diff --git a/source/blender/makesdna/DNA_group_types.h b/source/blender/makesdna/DNA_group_types.h
index 68ec82b4620..f7139101476 100644
--- a/source/blender/makesdna/DNA_group_types.h
+++ b/source/blender/makesdna/DNA_group_types.h
@@ -34,10 +34,6 @@
#ifndef DNA_GROUP_TYPES_H
#define DNA_GROUP_TYPES_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include "DNA_listBase.h"
#include "DNA_ID.h"
diff --git a/source/blender/makesdna/DNA_ika_types.h b/source/blender/makesdna/DNA_ika_types.h
index b2dc1550ba1..9024672fa01 100644
--- a/source/blender/makesdna/DNA_ika_types.h
+++ b/source/blender/makesdna/DNA_ika_types.h
@@ -40,11 +40,6 @@
#include "DNA_listBase.h"
#include "DNA_ID.h"
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-
struct Object;
struct Ipo;
diff --git a/source/blender/makesdna/DNA_image_types.h b/source/blender/makesdna/DNA_image_types.h
index 9683ed68599..a2dfdf00fd8 100644
--- a/source/blender/makesdna/DNA_image_types.h
+++ b/source/blender/makesdna/DNA_image_types.h
@@ -34,10 +34,6 @@
#ifndef DNA_IMAGE_TYPES_H
#define DNA_IMAGE_TYPES_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include "DNA_ID.h"
struct PackedFile;
diff --git a/source/blender/makesdna/DNA_ipo_types.h b/source/blender/makesdna/DNA_ipo_types.h
index ea9084006f5..1ee62ac2640 100644
--- a/source/blender/makesdna/DNA_ipo_types.h
+++ b/source/blender/makesdna/DNA_ipo_types.h
@@ -34,10 +34,6 @@
#ifndef DNA_IPO_TYPES_H
#define DNA_IPO_TYPES_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include "DNA_listBase.h"
#include "DNA_vec_types.h"
diff --git a/source/blender/makesdna/DNA_key_types.h b/source/blender/makesdna/DNA_key_types.h
index 4506b284a19..55f6d81aa06 100644
--- a/source/blender/makesdna/DNA_key_types.h
+++ b/source/blender/makesdna/DNA_key_types.h
@@ -37,10 +37,6 @@
#include "DNA_listBase.h"
#include "DNA_ID.h"
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
struct Ipo;
typedef struct KeyBlock {
diff --git a/source/blender/makesdna/DNA_lamp_types.h b/source/blender/makesdna/DNA_lamp_types.h
index 5e00e5cf500..0722c5d8cb6 100644
--- a/source/blender/makesdna/DNA_lamp_types.h
+++ b/source/blender/makesdna/DNA_lamp_types.h
@@ -37,10 +37,6 @@
#include "DNA_ID.h"
#include "DNA_scriptlink_types.h"
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
struct MTex;
struct Ipo;
diff --git a/source/blender/makesdna/DNA_lattice_types.h b/source/blender/makesdna/DNA_lattice_types.h
index 5e44bf704e9..43649467b96 100644
--- a/source/blender/makesdna/DNA_lattice_types.h
+++ b/source/blender/makesdna/DNA_lattice_types.h
@@ -36,10 +36,6 @@
#ifndef DNA_LATTICE_TYPES_H
#define DNA_LATTICE_TYPES_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include "DNA_ID.h"
struct BPoint;
diff --git a/source/blender/makesdna/DNA_listBase.h b/source/blender/makesdna/DNA_listBase.h
index a4feebfe0cc..10a1b59fb01 100644
--- a/source/blender/makesdna/DNA_listBase.h
+++ b/source/blender/makesdna/DNA_listBase.h
@@ -39,10 +39,6 @@
#ifndef DNA_LISTBASE_H
#define DNA_LISTBASE_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#ifdef __cplusplus
extern "C" {
#endif
diff --git a/source/blender/makesdna/DNA_material_types.h b/source/blender/makesdna/DNA_material_types.h
index 5c9cd3c9999..d21b27897ed 100644
--- a/source/blender/makesdna/DNA_material_types.h
+++ b/source/blender/makesdna/DNA_material_types.h
@@ -34,10 +34,6 @@
#ifndef DNA_MATERIAL_TYPES_H
#define DNA_MATERIAL_TYPES_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
/* #include "BLI_listBase.h" */
#include "DNA_ID.h"
diff --git a/source/blender/makesdna/DNA_mesh_types.h b/source/blender/makesdna/DNA_mesh_types.h
index 43a167ccfa1..6c04a243020 100644
--- a/source/blender/makesdna/DNA_mesh_types.h
+++ b/source/blender/makesdna/DNA_mesh_types.h
@@ -36,10 +36,6 @@
#ifndef DNA_MESH_TYPES_H
#define DNA_MESH_TYPES_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include "DNA_listBase.h"
#include "DNA_ID.h"
diff --git a/source/blender/makesdna/DNA_meta_types.h b/source/blender/makesdna/DNA_meta_types.h
index 18c9e3f5335..b227655a893 100644
--- a/source/blender/makesdna/DNA_meta_types.h
+++ b/source/blender/makesdna/DNA_meta_types.h
@@ -34,11 +34,6 @@
#ifndef DNA_META_TYPES_H
#define DNA_META_TYPES_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-
#include "DNA_listBase.h"
#include "DNA_ID.h"
diff --git a/source/blender/makesdna/DNA_nla_types.h b/source/blender/makesdna/DNA_nla_types.h
index 68e54f5db23..8c3c4d7a7a3 100644
--- a/source/blender/makesdna/DNA_nla_types.h
+++ b/source/blender/makesdna/DNA_nla_types.h
@@ -33,10 +33,6 @@
#ifndef DNA_NLA_TYPES_H
#define DNA_NLA_TYPES_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
struct bAction;
struct Ipo;
diff --git a/source/blender/makesdna/DNA_object_types.h b/source/blender/makesdna/DNA_object_types.h
index e3b29bafe61..2878442a0f3 100644
--- a/source/blender/makesdna/DNA_object_types.h
+++ b/source/blender/makesdna/DNA_object_types.h
@@ -36,10 +36,6 @@
#ifndef DNA_OBJECT_TYPES_H
#define DNA_OBJECT_TYPES_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include "DNA_listBase.h"
#include "DNA_ID.h"
#include "DNA_scriptlink_types.h"
diff --git a/source/blender/makesdna/DNA_oops_types.h b/source/blender/makesdna/DNA_oops_types.h
index 625c87f351b..52130c113cc 100644
--- a/source/blender/makesdna/DNA_oops_types.h
+++ b/source/blender/makesdna/DNA_oops_types.h
@@ -34,10 +34,6 @@
#ifndef DNA_OOPS_TYPES_H
#define DNA_OOPS_TYPES_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#define OOPSX 5.0
#define OOPSY 1.8
diff --git a/source/blender/makesdna/DNA_packedFile_types.h b/source/blender/makesdna/DNA_packedFile_types.h
index 71e5f03118c..7c4dc58006a 100644
--- a/source/blender/makesdna/DNA_packedFile_types.h
+++ b/source/blender/makesdna/DNA_packedFile_types.h
@@ -36,10 +36,6 @@
#ifndef DNA_PACKEDFILE_TYPES_H
#define DNA_PACKEDFILE_TYPES_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
typedef struct PackedFile {
int size;
int seek;
diff --git a/source/blender/makesdna/DNA_property_types.h b/source/blender/makesdna/DNA_property_types.h
index 1614d52db88..e46d557cc8b 100644
--- a/source/blender/makesdna/DNA_property_types.h
+++ b/source/blender/makesdna/DNA_property_types.h
@@ -37,10 +37,6 @@
#ifndef DNA_PROPERTY_TYPES_H
#define DNA_PROPERTY_TYPES_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
/* ********************* PROPERTY ************************ */
typedef struct bProperty {
diff --git a/source/blender/makesdna/DNA_radio_types.h b/source/blender/makesdna/DNA_radio_types.h
index d04607a12ce..29fd2bf082d 100644
--- a/source/blender/makesdna/DNA_radio_types.h
+++ b/source/blender/makesdna/DNA_radio_types.h
@@ -38,10 +38,6 @@
#ifndef DNA_RADIO_TYPES_H
#define DNA_RADIO_TYPES_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
typedef struct Radio {
short hemires, maxiter;
short drawtype, flag; /* bit 0 en 1: limits laten zien */
diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h
index 268ed5d86f1..3cc676587be 100644
--- a/source/blender/makesdna/DNA_scene_types.h
+++ b/source/blender/makesdna/DNA_scene_types.h
@@ -37,10 +37,6 @@
#ifndef DNA_SCENE_TYPES_H
#define DNA_SCENE_TYPES_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#ifdef __cplusplus
extern "C" {
#endif
diff --git a/source/blender/makesdna/DNA_screen_types.h b/source/blender/makesdna/DNA_screen_types.h
index 56f5fab4ef3..7fee3f7ca17 100644
--- a/source/blender/makesdna/DNA_screen_types.h
+++ b/source/blender/makesdna/DNA_screen_types.h
@@ -34,10 +34,6 @@
#ifndef DNA_SCREEN_TYPES_H
#define DNA_SCREEN_TYPES_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include "DNA_listBase.h"
#include "DNA_vec_types.h"
diff --git a/source/blender/makesdna/DNA_scriptlink_types.h b/source/blender/makesdna/DNA_scriptlink_types.h
index 48f68115191..4816c934202 100644
--- a/source/blender/makesdna/DNA_scriptlink_types.h
+++ b/source/blender/makesdna/DNA_scriptlink_types.h
@@ -36,10 +36,6 @@
#ifndef DNA_SCRIPTLINK_TYPES_H
#define DNA_SCRIPTLINK_TYPES_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#ifdef __cplusplus
extern "C" {
#endif
diff --git a/source/blender/makesdna/DNA_sdna_types.h b/source/blender/makesdna/DNA_sdna_types.h
index 89daad462d2..d8d15cced11 100644
--- a/source/blender/makesdna/DNA_sdna_types.h
+++ b/source/blender/makesdna/DNA_sdna_types.h
@@ -34,12 +34,6 @@
#ifndef DNA_SDNA_H
#define DNA_SDNA_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#
-#
struct SDNA {
char *data;
int datalen, nr_names;
diff --git a/source/blender/makesdna/DNA_sensor_types.h b/source/blender/makesdna/DNA_sensor_types.h
index 1a625fea1eb..d6192242da4 100644
--- a/source/blender/makesdna/DNA_sensor_types.h
+++ b/source/blender/makesdna/DNA_sensor_types.h
@@ -34,10 +34,6 @@
#ifndef DNA_SENSOR_TYPES_H
#define DNA_SENSOR_TYPES_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
struct Object;
struct Material;
diff --git a/source/blender/makesdna/DNA_sequence_types.h b/source/blender/makesdna/DNA_sequence_types.h
index 2fc3ea7c199..d7d72788c7a 100644
--- a/source/blender/makesdna/DNA_sequence_types.h
+++ b/source/blender/makesdna/DNA_sequence_types.h
@@ -34,10 +34,6 @@
#ifndef DNA_SEQUENCE_TYPES_H
#define DNA_SEQUENCE_TYPES_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include "DNA_listBase.h"
struct Ipo;
diff --git a/source/blender/makesdna/DNA_sound_types.h b/source/blender/makesdna/DNA_sound_types.h
index 75d03ef6c19..41429a0217e 100644
--- a/source/blender/makesdna/DNA_sound_types.h
+++ b/source/blender/makesdna/DNA_sound_types.h
@@ -34,10 +34,6 @@
#ifndef DNA_SOUND_TYPES_H
#define DNA_SOUND_TYPES_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include "DNA_listBase.h"
#include "DNA_ID.h"
diff --git a/source/blender/makesdna/DNA_space_types.h b/source/blender/makesdna/DNA_space_types.h
index 0a2a1246d1f..5abc9b47c05 100644
--- a/source/blender/makesdna/DNA_space_types.h
+++ b/source/blender/makesdna/DNA_space_types.h
@@ -34,10 +34,6 @@
#ifndef DNA_SPACE_TYPES_H
#define DNA_SPACE_TYPES_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include "DNA_listBase.h"
#include "DNA_vec_types.h"
/* Hum ... Not really nice... but needed for spacebuts. */
diff --git a/source/blender/makesdna/DNA_text_types.h b/source/blender/makesdna/DNA_text_types.h
index 0bdbd3c28a4..264ca33013c 100644
--- a/source/blender/makesdna/DNA_text_types.h
+++ b/source/blender/makesdna/DNA_text_types.h
@@ -34,10 +34,6 @@
#ifndef DNA_TEXT_TYPES_H
#define DNA_TEXT_TYPES_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include "DNA_listBase.h"
#include "DNA_ID.h"
diff --git a/source/blender/makesdna/DNA_texture_types.h b/source/blender/makesdna/DNA_texture_types.h
index 906a082005c..9a222850519 100644
--- a/source/blender/makesdna/DNA_texture_types.h
+++ b/source/blender/makesdna/DNA_texture_types.h
@@ -34,10 +34,6 @@
#ifndef DNA_TEXTURE_TYPES_H
#define DNA_TEXTURE_TYPES_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include "DNA_ID.h"
struct Ipo;
diff --git a/source/blender/makesdna/DNA_userdef_types.h b/source/blender/makesdna/DNA_userdef_types.h
index 73eb6cdadb2..38b4d3e6e07 100644
--- a/source/blender/makesdna/DNA_userdef_types.h
+++ b/source/blender/makesdna/DNA_userdef_types.h
@@ -35,10 +35,6 @@
#ifndef DNA_USERDEF_TYPES_H
#define DNA_USERDEF_TYPES_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
typedef struct UserDef {
short flag, dupflag;
int savetime;
diff --git a/source/blender/makesdna/DNA_vec_types.h b/source/blender/makesdna/DNA_vec_types.h
index ce7e10d7b86..9ae72b1c641 100644
--- a/source/blender/makesdna/DNA_vec_types.h
+++ b/source/blender/makesdna/DNA_vec_types.h
@@ -36,12 +36,7 @@
#ifndef DNA_VEC_TYPES_H
#define DNA_VEC_TYPES_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
/* types */
-
typedef struct vec2s {
short x, y;
} vec2s;
diff --git a/source/blender/makesdna/DNA_vfont_types.h b/source/blender/makesdna/DNA_vfont_types.h
index 3086aa99484..5f9e3f61446 100644
--- a/source/blender/makesdna/DNA_vfont_types.h
+++ b/source/blender/makesdna/DNA_vfont_types.h
@@ -34,10 +34,6 @@
#ifndef DNA_VFONT_TYPES_H
#define DNA_VFONT_TYPES_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include "DNA_ID.h"
struct PackedFile;
diff --git a/source/blender/makesdna/DNA_view2d_types.h b/source/blender/makesdna/DNA_view2d_types.h
index 3b3291a9d05..a0d9bf53b7a 100644
--- a/source/blender/makesdna/DNA_view2d_types.h
+++ b/source/blender/makesdna/DNA_view2d_types.h
@@ -34,10 +34,6 @@
#ifndef DNA_VIEW2D_TYPES_H
#define DNA_VIEW2D_TYPES_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include "DNA_vec_types.h"
typedef struct View2D {
diff --git a/source/blender/makesdna/DNA_view3d_types.h b/source/blender/makesdna/DNA_view3d_types.h
index 9f2ab991942..1cae50f58a6 100644
--- a/source/blender/makesdna/DNA_view3d_types.h
+++ b/source/blender/makesdna/DNA_view3d_types.h
@@ -34,10 +34,6 @@
#ifndef DNA_VIEW3D_TYPES_H
#define DNA_VIEW3D_TYPES_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
struct Object;
struct Image;
struct Tex;
diff --git a/source/blender/makesdna/DNA_wave_types.h b/source/blender/makesdna/DNA_wave_types.h
index 402ea0e94cf..e8f2607cee4 100644
--- a/source/blender/makesdna/DNA_wave_types.h
+++ b/source/blender/makesdna/DNA_wave_types.h
@@ -34,10 +34,6 @@
#ifndef DNA_WAVE_TYPES_H
#define DNA_WAVE_TYPES_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include "DNA_ID.h"
struct Ipo;
diff --git a/source/blender/makesdna/DNA_world_types.h b/source/blender/makesdna/DNA_world_types.h
index 405dcabe7c6..91e205e4038 100644
--- a/source/blender/makesdna/DNA_world_types.h
+++ b/source/blender/makesdna/DNA_world_types.h
@@ -34,10 +34,6 @@
#ifndef DNA_WORLD_TYPES_H
#define DNA_WORLD_TYPES_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include "DNA_ID.h"
#include "DNA_scriptlink_types.h"
diff --git a/source/blender/misc/blendertimer.h b/source/blender/misc/blendertimer.h
index f2b47c3a3ba..444f977be4d 100644
--- a/source/blender/misc/blendertimer.h
+++ b/source/blender/misc/blendertimer.h
@@ -38,10 +38,6 @@
#ifndef BLENDERTIMER_H
#define BLENDERTIMER_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#ifdef __cplusplus
extern "C" {
#endif
diff --git a/source/blender/radiosity/extern/include/radio.h b/source/blender/radiosity/extern/include/radio.h
index 3c949055fdc..23190a02ec2 100644
--- a/source/blender/radiosity/extern/include/radio.h
+++ b/source/blender/radiosity/extern/include/radio.h
@@ -43,10 +43,6 @@
/* type include */
#include "radio_types.h"
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
extern RadGlobal RG;
/* radfactors.c */
diff --git a/source/blender/radiosity/extern/include/radio_types.h b/source/blender/radiosity/extern/include/radio_types.h
index a0f9445355a..b485495e845 100644
--- a/source/blender/radiosity/extern/include/radio_types.h
+++ b/source/blender/radiosity/extern/include/radio_types.h
@@ -41,10 +41,6 @@
#include "DNA_listBase.h"
#include "DNA_material_types.h"
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#define DTWIRE 0
#define DTGOUR 2
#define DTSOLID 1
diff --git a/source/blender/readblenfile/BLO_readblenfile.h b/source/blender/readblenfile/BLO_readblenfile.h
index 6158e4d87e0..d1b89d8dc97 100644
--- a/source/blender/readblenfile/BLO_readblenfile.h
+++ b/source/blender/readblenfile/BLO_readblenfile.h
@@ -34,10 +34,6 @@
#ifndef BLO_READBLENFILE_H
#define BLO_READBLENFILE_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#ifdef __cplusplus
extern "C" {
#endif
diff --git a/source/blender/readstreamglue/BLO_keyStore.h b/source/blender/readstreamglue/BLO_keyStore.h
index 524740a5cb0..0b4bded6d97 100644
--- a/source/blender/readstreamglue/BLO_keyStore.h
+++ b/source/blender/readstreamglue/BLO_keyStore.h
@@ -34,10 +34,6 @@
#ifndef BLO_KEYSTORE_H
#define BLO_KEYSTORE_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#ifdef __cplusplus
extern "C" {
#endif
diff --git a/source/blender/readstreamglue/BLO_readStreamErrors.h b/source/blender/readstreamglue/BLO_readStreamErrors.h
index c5ae3b1cd4b..f49b0a45a0b 100644
--- a/source/blender/readstreamglue/BLO_readStreamErrors.h
+++ b/source/blender/readstreamglue/BLO_readStreamErrors.h
@@ -34,10 +34,6 @@
#ifndef BLO_READSTREAMERRORS_H
#define BLO_READSTREAMERRORS_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#ifdef __cplusplus
extern "C" {
#endif
diff --git a/source/blender/readstreamglue/BLO_readStreamGlue.h b/source/blender/readstreamglue/BLO_readStreamGlue.h
index ac9ef921192..ccd322cc97a 100644
--- a/source/blender/readstreamglue/BLO_readStreamGlue.h
+++ b/source/blender/readstreamglue/BLO_readStreamGlue.h
@@ -34,10 +34,6 @@
#ifndef BLO_READSTREAMGLUE_H
#define BLO_READSTREAMGLUE_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#ifdef __cplusplus
extern "C" {
#endif
diff --git a/source/blender/readstreamglue/BLO_sys_types.h b/source/blender/readstreamglue/BLO_sys_types.h
index 558982158a8..4ae5eca51da 100644
--- a/source/blender/readstreamglue/BLO_sys_types.h
+++ b/source/blender/readstreamglue/BLO_sys_types.h
@@ -43,10 +43,6 @@
#ifndef BLO_SYS_TYPES_H
#define BLO_SYS_TYPES_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#ifdef __cplusplus
extern "C" {
#endif
diff --git a/source/blender/readstreamglue/intern/BLO_keyStorePrivate.h b/source/blender/readstreamglue/intern/BLO_keyStorePrivate.h
index 6cabaad255d..f340927e415 100644
--- a/source/blender/readstreamglue/intern/BLO_keyStorePrivate.h
+++ b/source/blender/readstreamglue/intern/BLO_keyStorePrivate.h
@@ -33,10 +33,6 @@
#ifndef BLO_KEYSTOREPRIVATE_H
#define BLO_KEYSTOREPRIVATE_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#ifdef __cplusplus
extern "C" {
#endif
diff --git a/source/blender/readstreamglue/intern/BLO_readStreamGlueLoopBack.h b/source/blender/readstreamglue/intern/BLO_readStreamGlueLoopBack.h
index 1b32176bf3b..148b5016eb4 100644
--- a/source/blender/readstreamglue/intern/BLO_readStreamGlueLoopBack.h
+++ b/source/blender/readstreamglue/intern/BLO_readStreamGlueLoopBack.h
@@ -31,10 +31,6 @@
* streamglue loopback. Needed at start of Read stream.
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
struct readStreamGlueLoopBackStruct {
struct readStreamGlueStruct *streamGlue;
void *endControl;
diff --git a/source/blender/render/extern/include/render.h b/source/blender/render/extern/include/render.h
index a7aa4b95e43..972134f8be7 100644
--- a/source/blender/render/extern/include/render.h
+++ b/source/blender/render/extern/include/render.h
@@ -44,15 +44,10 @@
#include "BKE_osa_types.h"
#include "DNA_material_types.h"
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#ifdef __cplusplus
extern "C" {
#endif
-
/* For #undefs of stupid windows defines */
#ifdef WIN32
#include "BLI_winstuff.h"
diff --git a/source/blender/render/extern/include/render_types.h b/source/blender/render/extern/include/render_types.h
index 1829262519d..2f33ae686a5 100644
--- a/source/blender/render/extern/include/render_types.h
+++ b/source/blender/render/extern/include/render_types.h
@@ -35,17 +35,11 @@
#include "DNA_scene_types.h"
#include "DNA_world_types.h"
-/* ------------------------------------------------------------------------- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
/* Definitely weird: this equals 1<<21... so wtf?*/
#define MAXVERT (2<<20)
#define MAXVLAK (2<<20)
-
/* This is needed to not let VC choke on near and far... old
* proprietary MS extensions... */
#ifdef WIN32
diff --git a/source/blender/render/intern/include/RE_DummyShadowBuffer.h b/source/blender/render/intern/include/RE_DummyShadowBuffer.h
index e41651c21c4..2522943fff2 100644
--- a/source/blender/render/intern/include/RE_DummyShadowBuffer.h
+++ b/source/blender/render/intern/include/RE_DummyShadowBuffer.h
@@ -35,10 +35,6 @@
#include "RE_ShadowBuffer.h"
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
struct LampRen;
class RE_DummyShadowBuffer : public RE_ShadowBuffer {
diff --git a/source/blender/render/intern/include/RE_ShadowBuffer.h b/source/blender/render/intern/include/RE_ShadowBuffer.h
index 36e719a6736..c501b3b1b82 100644
--- a/source/blender/render/intern/include/RE_ShadowBuffer.h
+++ b/source/blender/render/intern/include/RE_ShadowBuffer.h
@@ -35,10 +35,6 @@
#include <iostream.h>
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
struct ShadBuf;
struct LampRen;
diff --git a/source/blender/render/intern/include/RE_basicShadowBuffer.h b/source/blender/render/intern/include/RE_basicShadowBuffer.h
index 79f5ffd1ab4..2bf9fcd1ff0 100644
--- a/source/blender/render/intern/include/RE_basicShadowBuffer.h
+++ b/source/blender/render/intern/include/RE_basicShadowBuffer.h
@@ -35,10 +35,6 @@
#include "RE_ShadowBuffer.h"
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
struct LampRen;
struct Lamp;
diff --git a/source/blender/render/intern/include/RE_callbacks.h b/source/blender/render/intern/include/RE_callbacks.h
index 8a53923cb8b..159eaa84ca4 100644
--- a/source/blender/render/intern/include/RE_callbacks.h
+++ b/source/blender/render/intern/include/RE_callbacks.h
@@ -34,10 +34,6 @@
#ifndef RE_CALLBACKS_H
#define RE_CALLBACKS_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#ifdef __cplusplus
extern "C" {
#endif
diff --git a/source/blender/render/intern/include/edgeRender.h b/source/blender/render/intern/include/edgeRender.h
index 63b0ab1c99d..4d75d812711 100644
--- a/source/blender/render/intern/include/edgeRender.h
+++ b/source/blender/render/intern/include/edgeRender.h
@@ -35,12 +35,6 @@
#ifndef EDGERENDER_H
#define EDGERENDER_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-/* ------------------------------------------------------------------------- */
-
/**
* Add edges to <targetbuf>, which is of size <iw> by <ih>. Use <osanr>
* samples, and intensity <i>. <compat> indicates an extra shift in the
diff --git a/source/blender/render/intern/include/envmap.h b/source/blender/render/intern/include/envmap.h
index 89ec76a9f08..de5c0de974d 100644
--- a/source/blender/render/intern/include/envmap.h
+++ b/source/blender/render/intern/include/envmap.h
@@ -35,13 +35,6 @@
#ifndef ENVMAP_EXT_H
#define ENVMAP_EXT_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-/* no types!!! */
-/* #include "envmap_types.h" */
-
/**
* Make environment maps for all objects in the scene that have an
* environment map as texture.
diff --git a/source/blender/render/intern/include/errorHandler.h b/source/blender/render/intern/include/errorHandler.h
index 4878ba571a5..fb980fa255a 100644
--- a/source/blender/render/intern/include/errorHandler.h
+++ b/source/blender/render/intern/include/errorHandler.h
@@ -35,11 +35,6 @@
#ifndef ERRORHANDLER_H
#define ERRORHANDLER_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-/* ------------------------------------------------------------------------- */
/* error codes */
enum RE_RENDER_ERROR {
RE_NO_ERROR,
diff --git a/source/blender/render/intern/include/gammaCorrectionTables.h b/source/blender/render/intern/include/gammaCorrectionTables.h
index 2bef629582d..8df743e468d 100644
--- a/source/blender/render/intern/include/gammaCorrectionTables.h
+++ b/source/blender/render/intern/include/gammaCorrectionTables.h
@@ -35,11 +35,6 @@
#ifndef GAMMACORRECTIONTABLES_H
#define GAMMACORRECTIONTABLES_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-
/* Default gamma. For most CRTs, gamma ranges from 2.2 to 2.5 (Foley), so */
/* 2.35 seems appropriate enough. Experience teaches a different number */
/* though. Old blender: 2.0. It might be nice to make this a slider */
diff --git a/source/blender/render/intern/include/initrender.h b/source/blender/render/intern/include/initrender.h
index 79f376aa10c..06c5f032c7d 100644
--- a/source/blender/render/intern/include/initrender.h
+++ b/source/blender/render/intern/include/initrender.h
@@ -40,10 +40,6 @@
#include "DNA_effect_types.h" /* for PartEff type */
#include "render_types.h"
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
/* Functions */
void init_def_material(void);
diff --git a/source/blender/render/intern/include/jitter.h b/source/blender/render/intern/include/jitter.h
index 93cef086b75..beae4af0a40 100644
--- a/source/blender/render/intern/include/jitter.h
+++ b/source/blender/render/intern/include/jitter.h
@@ -35,10 +35,6 @@
#ifndef JITTER_H
#define JITTER_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#ifdef __cplusplus
extern "C" {
#endif
diff --git a/source/blender/render/intern/include/old_zbuffer_types.h b/source/blender/render/intern/include/old_zbuffer_types.h
index 8280fdf6c77..4adf5f047ba 100644
--- a/source/blender/render/intern/include/old_zbuffer_types.h
+++ b/source/blender/render/intern/include/old_zbuffer_types.h
@@ -34,12 +34,6 @@
#ifndef OLD_ZBUFFER_TYPES_H
#define OLD_ZBUFFER_TYPES_H "$Id$"
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-/* ------------------------------------------------------------------------- */
-
typedef struct PixStr
{
struct PixStr *next;
diff --git a/source/blender/render/intern/include/outerRenderLoop.h b/source/blender/render/intern/include/outerRenderLoop.h
index fb46475d70d..1c0faf666ae 100644
--- a/source/blender/render/intern/include/outerRenderLoop.h
+++ b/source/blender/render/intern/include/outerRenderLoop.h
@@ -35,10 +35,6 @@
#ifndef OUTERRENDERLOOP_H
#define OUTERRENDERLOOP_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
/**
* Outer loop for rendering a single picture.
*/
diff --git a/source/blender/render/intern/include/pixelblending.h b/source/blender/render/intern/include/pixelblending.h
index 316f6dc34dd..04fc037865f 100644
--- a/source/blender/render/intern/include/pixelblending.h
+++ b/source/blender/render/intern/include/pixelblending.h
@@ -42,11 +42,6 @@
/* own include */
#include "pixelblending_types.h"
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-
/**
* Samples pixel, depending on R.osa setting
*/
diff --git a/source/blender/render/intern/include/pixelblending_types.h b/source/blender/render/intern/include/pixelblending_types.h
index 18cd1e0bd70..dac9924494f 100644
--- a/source/blender/render/intern/include/pixelblending_types.h
+++ b/source/blender/render/intern/include/pixelblending_types.h
@@ -36,12 +36,6 @@
#ifndef PIXELBLENDING_TYPES_H
#define PIXELBLENDING_TYPES_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-/* #include "blender.h" */
-
/* Threshold for a 'full' pixel: pixels with alpha above this level are */
/* considered opaque This is the decimal value for 0xFFF0 / 0xFFFF */
#define RE_FULL_COLOUR_FLOAT 0.9998
diff --git a/source/blender/render/intern/include/pixelshading.h b/source/blender/render/intern/include/pixelshading.h
index 45669e8b121..3df3067f0a5 100644
--- a/source/blender/render/intern/include/pixelshading.h
+++ b/source/blender/render/intern/include/pixelshading.h
@@ -37,15 +37,8 @@
#ifndef PIXELSHADING_H
#define PIXELSHADING_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-/* ------------------------------------------------------------------------- */
-
#include "render.h"
#include "vanillaRenderPipe_types.h"
-/* ------------------------------------------------------------------------- */
/**
* Render the pixel at (x,y) for object ap. Apply the jitter mask.
diff --git a/source/blender/render/intern/include/renderHelp.h b/source/blender/render/intern/include/renderHelp.h
index 89ace11fa1e..318b538d510 100644
--- a/source/blender/render/intern/include/renderHelp.h
+++ b/source/blender/render/intern/include/renderHelp.h
@@ -35,10 +35,6 @@
#ifndef RENDERHELP_EXT_H
#define RENDERHELP_EXT_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#ifdef __cplusplus
extern "C" {
#endif
diff --git a/source/blender/render/intern/include/renderPreAndPost.h b/source/blender/render/intern/include/renderPreAndPost.h
index 7fef4b2e68e..59315868010 100644
--- a/source/blender/render/intern/include/renderPreAndPost.h
+++ b/source/blender/render/intern/include/renderPreAndPost.h
@@ -35,10 +35,6 @@
#ifndef RENDERPREANDPOST_H
#define RENDERPREANDPOST_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
void prepareScene(void);
void finalizeScene(void);
void doClipping( void (*projectfunc)(float *, float *) );
diff --git a/source/blender/render/intern/include/render_intern.h b/source/blender/render/intern/include/render_intern.h
index df0692df0c6..25302ad97bd 100644
--- a/source/blender/render/intern/include/render_intern.h
+++ b/source/blender/render/intern/include/render_intern.h
@@ -33,10 +33,6 @@
* ***** END GPL/BL DUAL LICENSE BLOCK *****
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
/* XXX, should die, no good reason to write
* regular (non-file related) endian dependant
* code.
diff --git a/source/blender/render/intern/include/rendercore.h b/source/blender/render/intern/include/rendercore.h
index 1e0cd77b5c7..8f414936cad 100644
--- a/source/blender/render/intern/include/rendercore.h
+++ b/source/blender/render/intern/include/rendercore.h
@@ -36,10 +36,6 @@
#define RENDERCORE_H
#include "render_types.h"
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
struct HaloRen;
float mistfactor(float *co); /* dist en hoogte, return alpha */
diff --git a/source/blender/render/intern/include/rendercore_int.h b/source/blender/render/intern/include/rendercore_int.h
index 7c0e402a0b3..45b881fe27f 100644
--- a/source/blender/render/intern/include/rendercore_int.h
+++ b/source/blender/render/intern/include/rendercore_int.h
@@ -38,10 +38,6 @@
#include "zbuf_types.h"
#include "render_types.h"
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
/* float CookTorr(float *n, float *l, float *v, int hard); */
void do_lamphalo_tex(LampRen *lar, float *p1, float *p2, float *intens);
void spothalo(struct LampRen *lar, float *view, float *intens);
diff --git a/source/blender/render/intern/include/shadbuf.h b/source/blender/render/intern/include/shadbuf.h
index 6db4aebee7e..81ec34397cc 100644
--- a/source/blender/render/intern/include/shadbuf.h
+++ b/source/blender/render/intern/include/shadbuf.h
@@ -35,10 +35,6 @@
#ifndef SHADBUF_EXT_H
#define SHADBUF_EXT_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include "render_types.h"
#ifdef __cplusplus
diff --git a/source/blender/render/intern/include/shadowBuffer.h b/source/blender/render/intern/include/shadowBuffer.h
index ae1f1b6f83c..46b24573fa8 100644
--- a/source/blender/render/intern/include/shadowBuffer.h
+++ b/source/blender/render/intern/include/shadowBuffer.h
@@ -33,10 +33,6 @@
#ifndef SHADOWBUFFER_H
#define SHADOWBUFFER_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#ifdef __cplusplus
extern "C" {
#endif
diff --git a/source/blender/render/intern/include/texture.h b/source/blender/render/intern/include/texture.h
index c10e7a61851..5cf2c077926 100644
--- a/source/blender/render/intern/include/texture.h
+++ b/source/blender/render/intern/include/texture.h
@@ -36,13 +36,6 @@
#define TEXTURE_EXT_H "$Id$"
#define TEXTURE_EXT_H "Copyright (C) 2001 NaN Technologies B.V.
-/* no types!!! */
-/* #include "texture_types.h" */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
struct Tex;
struct MTex;
struct HaloRen;
diff --git a/source/blender/render/intern/include/vanillaRenderPipe.h b/source/blender/render/intern/include/vanillaRenderPipe.h
index a20e9a98687..1ace0c23610 100644
--- a/source/blender/render/intern/include/vanillaRenderPipe.h
+++ b/source/blender/render/intern/include/vanillaRenderPipe.h
@@ -37,10 +37,6 @@
#include "vanillaRenderPipe_types.h"
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
/**
* Render pipeline with all kinds of extras.
* status-------------------------\/
diff --git a/source/blender/render/intern/include/vanillaRenderPipe_int.h b/source/blender/render/intern/include/vanillaRenderPipe_int.h
index e825d4a2189..980befae66f 100644
--- a/source/blender/render/intern/include/vanillaRenderPipe_int.h
+++ b/source/blender/render/intern/include/vanillaRenderPipe_int.h
@@ -38,10 +38,6 @@
#include "vanillaRenderPipe_types.h"
#include "zbufferdatastruct_types.h"
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
/**
* Z buffer initializer, for new pipeline.
* <LI>
diff --git a/source/blender/render/intern/include/vanillaRenderPipe_types.h b/source/blender/render/intern/include/vanillaRenderPipe_types.h
index a0e1d04554b..cf4f2ffb289 100644
--- a/source/blender/render/intern/include/vanillaRenderPipe_types.h
+++ b/source/blender/render/intern/include/vanillaRenderPipe_types.h
@@ -35,10 +35,6 @@
#ifndef VANILLARENDERPIPE_TYPES_H
#define VANILLARENDERPIPE_TYPES_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
/* Render defines */
#define RE_MAX_OSA_COUNT 16 /* The max. number of possible oversamples */
#define RE_MAX_FACES_PER_PIXEL 500 /* max. nr of faces rendered behind one */
diff --git a/source/blender/render/intern/include/zbuf.h b/source/blender/render/intern/include/zbuf.h
index 10e00415d44..fdfa5b19abe 100644
--- a/source/blender/render/intern/include/zbuf.h
+++ b/source/blender/render/intern/include/zbuf.h
@@ -36,10 +36,6 @@
#ifndef ZBUF_H
#define ZBUF_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#ifdef __cplusplus
extern "C" {
#endif
diff --git a/source/blender/render/intern/include/zbuf_int.h b/source/blender/render/intern/include/zbuf_int.h
index 3d442daca1d..367162be10e 100644
--- a/source/blender/render/intern/include/zbuf_int.h
+++ b/source/blender/render/intern/include/zbuf_int.h
@@ -40,10 +40,6 @@
#include "render_types.h"
#include "zbuf_types.h"
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
/**
* Convert a homogenous coordinate to a z buffer coordinate. The
* function makes use of Zmulx, Zmuly, the x and y scale factors for
diff --git a/source/blender/render/intern/include/zbuf_types.h b/source/blender/render/intern/include/zbuf_types.h
index fa3e5cdb9e0..b5ad9c75902 100644
--- a/source/blender/render/intern/include/zbuf_types.h
+++ b/source/blender/render/intern/include/zbuf_types.h
@@ -36,10 +36,6 @@
#ifndef ZBUF_TYPES_H
#define ZBUF_TYPES_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#ifdef __cplusplus
extern "C" {
#endif
diff --git a/source/blender/render/intern/include/zbufferdatastruct.h b/source/blender/render/intern/include/zbufferdatastruct.h
index f5bd2a409c7..790cce2cb77 100644
--- a/source/blender/render/intern/include/zbufferdatastruct.h
+++ b/source/blender/render/intern/include/zbufferdatastruct.h
@@ -37,10 +37,6 @@
#include "zbufferdatastruct_types.h"
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
/**
* Set memory and counters for a fresh z buffer
*/
diff --git a/source/blender/render/intern/include/zbufferdatastruct_types.h b/source/blender/render/intern/include/zbufferdatastruct_types.h
index 35351a63869..0607f19bbc9 100644
--- a/source/blender/render/intern/include/zbufferdatastruct_types.h
+++ b/source/blender/render/intern/include/zbufferdatastruct_types.h
@@ -35,10 +35,6 @@
#ifndef ZBUFFERDATASTRUCT_TYPES_H
#define ZBUFFERDATASTRUCT_TYPES_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#define RE_ZBUFLEN 64 /* number of lines in the accumulation buffer */
/**
diff --git a/source/blender/renderconverter/RE_renderconverter.h b/source/blender/renderconverter/RE_renderconverter.h
index b089830a1f9..851333371f6 100644
--- a/source/blender/renderconverter/RE_renderconverter.h
+++ b/source/blender/renderconverter/RE_renderconverter.h
@@ -60,10 +60,6 @@
#ifndef RE_RENDERCONVERTER_H
#define RE_RENDERCONVERTER_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#ifdef __cplusplus
extern "C" {
#endif
diff --git a/source/blender/sign/BLO_sign.h b/source/blender/sign/BLO_sign.h
index 64f54e00d78..eb2a859808a 100644
--- a/source/blender/sign/BLO_sign.h
+++ b/source/blender/sign/BLO_sign.h
@@ -33,10 +33,6 @@
#ifndef BLO_SIGN_H
#define BLO_SIGN_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#ifdef __cplusplus
extern "C" {
#endif
diff --git a/source/blender/src/winlay.h b/source/blender/src/winlay.h
index 53a26dc05b7..fb2a2fcb89d 100644
--- a/source/blender/src/winlay.h
+++ b/source/blender/src/winlay.h
@@ -30,10 +30,6 @@
* ***** END GPL/BL DUAL LICENSE BLOCK *****
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
/* Abstract window operations */
typedef struct _Window Window;
diff --git a/source/blender/verify/BLO_sign_verify_Header.h b/source/blender/verify/BLO_sign_verify_Header.h
index 37470c72443..8f26eed95aa 100644
--- a/source/blender/verify/BLO_sign_verify_Header.h
+++ b/source/blender/verify/BLO_sign_verify_Header.h
@@ -34,10 +34,6 @@
#ifndef BLO_SIGN_VERIFY_H
#define BLO_SIGN_VERIFY_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#ifdef __cplusplus
extern "C" {
#endif
diff --git a/source/blender/verify/BLO_signer_info.h b/source/blender/verify/BLO_signer_info.h
index 0fdf9c6286a..d2e6b987147 100644
--- a/source/blender/verify/BLO_signer_info.h
+++ b/source/blender/verify/BLO_signer_info.h
@@ -33,10 +33,6 @@
#include "BLO_sign_verify_Header.h"
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
/* external struct for signer info */
struct BLO_SignerInfo {
diff --git a/source/blender/verify/BLO_verify.h b/source/blender/verify/BLO_verify.h
index 50eb2e4ab04..6396c4d6c73 100644
--- a/source/blender/verify/BLO_verify.h
+++ b/source/blender/verify/BLO_verify.h
@@ -33,10 +33,6 @@
#ifndef BLO_VERIFY_H
#define BLO_VERIFY_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#ifdef __cplusplus
extern "C" {
#endif
diff --git a/source/blender/writeblenfile/BLO_writeblenfile.h b/source/blender/writeblenfile/BLO_writeblenfile.h
index efabf7c3455..a87f294b417 100644
--- a/source/blender/writeblenfile/BLO_writeblenfile.h
+++ b/source/blender/writeblenfile/BLO_writeblenfile.h
@@ -34,10 +34,6 @@
#ifndef BLO_WRITEBLENFILE_H
#define BLO_WRITEBLENFILE_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#ifdef __cplusplus
extern "C" {
#endif
diff --git a/source/blender/writestreamglue/BLO_getPubKey.h b/source/blender/writestreamglue/BLO_getPubKey.h
index 3c63e7b500b..b9d8daf8ff6 100644
--- a/source/blender/writestreamglue/BLO_getPubKey.h
+++ b/source/blender/writestreamglue/BLO_getPubKey.h
@@ -32,15 +32,6 @@
* STUB: give back the dataStreamPubKey
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-
- int
-getPubKey(byte *dataStreamPubKey,
- int dataStreamPubKeyLen,
- byte **publisherPubKey,
- int *publisherPubKeyLen);
-
+int getPubKey(byte *dataStreamPubKey, int dataStreamPubKeyLen,
+ byte **publisherPubKey, int *publisherPubKeyLen);
diff --git a/source/blender/writestreamglue/BLO_writeStreamErrors.h b/source/blender/writestreamglue/BLO_writeStreamErrors.h
index c926511eaa6..cc86660b8d0 100644
--- a/source/blender/writestreamglue/BLO_writeStreamErrors.h
+++ b/source/blender/writestreamglue/BLO_writeStreamErrors.h
@@ -36,10 +36,6 @@
#ifndef BLO_WRITESTREAMERRORS_H
#define BLO_WRITESTREAMERRORS_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#ifdef __cplusplus
extern "C" {
#endif
diff --git a/source/blender/writestreamglue/BLO_writeStreamGlue.h b/source/blender/writestreamglue/BLO_writeStreamGlue.h
index c5259b564fa..85101d8c79b 100644
--- a/source/blender/writestreamglue/BLO_writeStreamGlue.h
+++ b/source/blender/writestreamglue/BLO_writeStreamGlue.h
@@ -34,10 +34,6 @@
#ifndef BLO_WRITESTREAMGLUE_H
#define BLO_WRITESTREAMGLUE_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#ifdef __cplusplus
extern "C" {
#endif
diff --git a/source/blender/writestreamglue/intern/BLO_dumpFromMemory.h b/source/blender/writestreamglue/intern/BLO_dumpFromMemory.h
index 238f5c7a654..cb418f67f01 100644
--- a/source/blender/writestreamglue/intern/BLO_dumpFromMemory.h
+++ b/source/blender/writestreamglue/intern/BLO_dumpFromMemory.h
@@ -31,10 +31,6 @@
* streamglue loopback adds a streamGlueHeader to start of the write stream
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
int
BLO_dumpFromMemory(
unsigned char *data,